mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 23:13:13 +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
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