vanhofen 4dc0113a94 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox ...

Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)



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

2017-09-14 16:23:15 +02:00

..

Debug.cpp

testing dvb subtitles

2009-12-29 18:33:45 +00:00

Debug.hpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

dvbsub.cpp

dvbsub: enable debug output for testing

2017-06-16 15:11:48 +02:00

dvbsub.h

Attempt to fix #233

2010-02-03 16:04:27 +00:00

dvbsubtitle.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-09-14 16:23:15 +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

change 'long long' tom int64_t'; change variable buf to new delete;

2010-02-07 14:32:21 +00:00

helpers.hpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

Makefile.am

fix Makefiles to include SIGC_CFLAGS

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

PacketQueue.cpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

PacketQueue.hpp

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

tools.cpp

comment warning off

2009-12-16 15:58:14 +00:00

tools.h

lib/libdvbsub/tools.h unused

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