vanhofen ff7b7dfde7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



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

2017-02-12 23:04:09 +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

2017-02-12 23:04:09 +01:00

sectionsdclient.h

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

2017-02-12 23:04:09 +01:00

sectionsdcontrol.cpp

…

sectionsdMsg.h

sectionsdclient: remove unused scanMode variable

2017-02-12 22:48:55 +01:00

sectionsdtypes.h

…