Stefan Seyfried a968a12b8d Merge remote-tracking branch 'check/cst-next' ...

*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)

2015-01-26 17:26:26 +01:00

..

fonts

add font with simplified chinese support

2013-06-11 17:46:05 +04:00

icons

Merge remote-tracking branch 'check/cst-next'

2014-12-25 18:03:08 +01:00

inetradio

…

initial

update initial services

2015-01-02 18:58:46 +01:00

iso-codes

…

lcd

…

license

CImageInfo: rework some parts of imageinfo

2013-11-11 00:20:10 +01:00

locale

Merge remote-tracking branch 'check/cst-next'

2015-01-26 17:26:26 +01:00

neutrino-scripts

Software update: Copy flashimage to /tmp if it is not present in this directory

2013-06-13 01:36:03 +02:00

scripts

…

themes

…

cables.xml

data/cables.xml: add ziggo/upc providers

2014-09-25 16:37:21 +04:00

encoding.conf

update encoding.conf

2013-08-08 15:51:47 +02:00

Makefile.am

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

mk_terrestrial_xml.pl

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

providermap.xml

…

satellites.xml

satellites.xml: update freq 12722000 as suggested by Janus

2014-06-06 19:00:25 +02:00

settingsupdate.conf

…

terrestrial.xml

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

tobackup.conf

…