Michael Liebmann fddb8f5760 Merge branch 'master' into pu/fb-setmode ...

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1852183fa6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


------------------
No further description and justification available within origin commit message!

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

2017-04-24 22:35:45 +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

network menu (#264)

2010-03-15 20:49:03 +00:00

tuxtxt_common.h

tuxtxt: remove dead code, unnecessary header includes

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

tuxtxt_def.h

tuxtxt: remove unused dmx variable

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

tuxtxt.cpp

lib/libtuxtxt/tuxtxt.cpp: Update for hd1/hd2

2017-03-28 23:56:57 +02:00

tuxtxt.h

tuxtxt: remove dead code, unnecessary header includes

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