vanhofen 038c20d9b4 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox ...

Conflicts:
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73ea6fddcb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



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

2017-03-06 23:26:32 +01:00

..

libtuxtxt.cpp

tuxtxt: remove dead code, unnecessary header includes

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

Makefile.am

libtuxtxt: Transfer from neutrino-mp for better compatibility

2017-02-15 18:38:03 +01: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

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

2017-02-21 15:14:31 +01:00

tuxtxt_def.h

tuxtxt: remove unused dmx variable

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

tuxtxt.cpp

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

2017-03-06 23:26:32 +01:00

tuxtxt.h

tuxtxt: remove dead code, unnecessary header includes

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