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

@@ -1,4 +1,4 @@
AM_CPPFLAGS = -fno-rtti -fno-exceptions
AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
INCLUDES = \
-I$(top_builddir) \