[CST] Bas 89bf2f6846 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo ...

Conflicts:
	src/neutrino.cpp

2012-11-13 12:51:18 +08:00

..

daemonc

NeutrinoMessages fix memleak , ported from tuxbox cvs

2012-10-21 18:45:39 +02:00

driver

Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

2012-11-13 12:51:18 +08:00

eitd

Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

2012-09-24 15:28:48 +08:00

gui

Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

2012-11-13 12:51:18 +08:00

lcddisplay

…

nhttpd

Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

2012-11-13 12:51:18 +08:00

system

Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++

2012-11-07 13:04:52 +01:00

timerd

Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

2012-11-13 12:51:18 +08:00

zapit

Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

2012-11-13 12:51:18 +08:00

drivertool.c

neutrino: fix code to new 'generic' frontpanel/ir headers.

2012-09-26 18:19:35 +08:00

global.h

- shutdown_count.cpp: add NEUTRINO_ENTER_INACTIVITY_SCRIPT

2012-11-01 20:30:18 +01:00

Makefile.am

Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

2012-07-09 11:56:40 +08:00

mymenu.h

…

neutrino_menue.cpp

remove doubles include

2012-09-11 20:31:33 +02:00

neutrino_menue.h

neutrino_menue.h: add menu ID for cable scan

2012-07-31 18:17:55 +04:00

neutrino.cpp

Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

2012-11-13 12:51:18 +08:00

neutrino.h

neutrino.h: remove unused colorSetupNotifier

2012-11-02 14:43:16 +04:00

neutrinoMessages.h

…

plugin.h

…