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

..

Debug.cpp

…

Debug.hpp

…

dvbsub.cpp

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

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

dvbsub.h

…

dvbsubtitle.cpp

Fix merge conflicts

2016-08-20 09:01:33 +02:00

dvbsubtitle.h

libdvbsub: fix compile with new mandatory -D__STDC_CONSTANT_MACROS compiler flag

2015-10-13 14:04:10 +02:00

helpers.cpp

…

helpers.hpp

…

Makefile.am

fix Makefiles to include SIGC_CFLAGS

2016-10-23 17:22:16 +02:00

PacketQueue.cpp

…

PacketQueue.hpp

…

tools.cpp

…

tools.h

lib/libdvbsub/tools.h unused

2016-04-16 18:07:16 +02:00