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

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



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

2017-08-23 15:24:38 +02:00

..

libtuxtxt.cpp

tuxtxt: remove dead code, unnecessary header includes

2017-02-21 06:38:48 +01:00

Makefile.am

lib/libtuxtxt/Makefile.am: Fix FREETYPE_CFLAGS

2017-04-24 22:34:51 +02:00

teletext.h

libtuxtxt: remove unused fd parameter from tuxtx_main()

2017-02-21 06:38:48 +01:00

tuxtxt2.conf

…

tuxtxt_common.h

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

2017-08-23 15:24:38 +02:00

tuxtxt_def.h

tuxtxt: remove unused dmx variable

2017-02-21 06:38:48 +01:00

tuxtxt.cpp

lib-libtuxtxt-tuxtxt.cpp avoid segfault, supplement to 6771de1

2017-06-29 15:05:30 +02:00

tuxtxt.h

tuxtxt: remove dead code, unnecessary header includes

2017-02-21 06:38:48 +01:00