[CST] Focus 026592e8fe Merge branch 'dvbsi++' into next ...

Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp

2013-02-28 16:39:34 +04:00

..

Makefile.am

Merge branch 'dvbsi++' into next

2013-02-28 16:39:34 +04:00

remotecontrol.cpp

neutrino: fix 32<->64bit format string warnings

2013-02-21 15:47:18 +01:00

remotecontrol.h

daemonc/remotecontrol.cpp: comment current_programm_timer, CN events should be enough

2012-03-06 18:07:41 +04:00