vanhofen 6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit

2016-11-21 12:46:49 +01:00

..

Makefile.am

make sure the private dvb headers are used on coolstream

2016-11-16 20:30:14 +01:00

sectionsdclient.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2016-11-21 12:46:49 +01:00

sectionsdclient.h

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2016-11-21 12:46:49 +01:00

sectionsdcontrol.cpp

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

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

sectionsdMsg.h

add option to read saved epg data frequently

2016-11-20 19:24:08 +01:00

sectionsdtypes.h

…