Stefan Seyfried 27493de2ef neutrino: add the possibility to lock bouquets by default ...

This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.

Conflicts:
	src/gui/channellist.cpp

2013-04-05 15:52:58 +04:00

..

Makefile.am

Merge branch 'dvbsi++' into next

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

remotecontrol.cpp

neutrino: add the possibility to lock bouquets by default

2013-04-05 15:52:58 +04:00

remotecontrol.h

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

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