vanhofen 6e85f1b0ca 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: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



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

2017-02-12 23:01:15 +01:00

..

libtuxtxt.cpp

libtuxtxt: compil fix

2011-07-23 14:08:55 +00:00

Makefile.am

fix Makefiles to include SIGC_CFLAGS

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

teletext.h

Remove some globals from vcrcontrol

2011-01-25 17:22:38 +00: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-12 23:01:15 +01:00

tuxtxt_def.h

our current experimental Neutrino branch

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

tuxtxt.cpp

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

2017-02-12 23:01:15 +01:00

tuxtxt.h

NI \o/

2016-05-19 22:59:54 +02:00