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:
[CST] Focus
2013-02-28 16:39:34 +04:00
70 changed files with 544 additions and 417 deletions

View File

@@ -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