Stefan Seyfried d37b3c0f9a Merge remote-tracking branch 'check/cst-next' ...

Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp

2014-12-28 12:32:12 +01:00

..

Makefile.am

Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am

2013-10-17 04:22:49 +02:00

sectionsdclient.cpp

Merge remote-tracking branch 'check/cst-next'

2014-12-28 12:32:12 +01:00

sectionsdclient.h

Merge remote-tracking branch 'check/cst-next'

2014-12-28 12:32:12 +01:00

sectionsdcontrol.cpp

lib/sectionsdclient/sectionsdcontrol.cpp: add --freemem command

2012-04-25 11:26:35 +04:00

sectionsdMsg.h

- add epg_save_frequently feature ...

2014-12-05 09:08:56 +01:00

sectionsdtypes.h

…