mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
Merge branch 'dvbsi++' into next
Conflicts:
src/neutrino.cpp
src/zapit/src/femanager.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
Origin commit data
------------------
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
This commit is contained in:
@@ -192,6 +192,7 @@ src/driver/audiodec/Makefile
|
||||
src/driver/Makefile
|
||||
src/gui/Makefile
|
||||
src/gui/bedit/Makefile
|
||||
src/gui/components/Makefile
|
||||
src/gui/widget/Makefile
|
||||
src/system/Makefile
|
||||
data/Makefile
|
||||
|
Reference in New Issue
Block a user