Michael Liebmann 2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next ...

- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



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

2016-08-19 17:40:48 +02:00

..

fonts

add font with simplified chinese support

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

icons

Merge branch 'cst-next' into nmp-cst-next

2016-08-19 17:40:48 +02:00

inetradio

update radio-stations.xml (thx bazi98)

2011-02-17 11:45:52 +00:00

initial

update initial services

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

iso-codes

Remove most exotic never seen languages from table, to cut upcoming prefered language menu; Full tab left for reference

2010-02-17 09:58:58 +00:00

lcd

optimize jpg,png size

2012-08-08 17:10:12 +02:00

license

CImageInfo: rework some parts of imageinfo

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

locale

Merge branch 'cst-next' into nmp-cst-next

2016-08-19 17:40:48 +02: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

yweb: rework, localize and enable backup/restore

2012-07-21 23:31:59 +02:00

themes

add Bluemoon-3.0.theme

2016-04-05 17:42:57 +02:00

bad_package_pattern.list.sample

COPKGManager: use config file for bad package detection

2015-12-28 12:13:51 +01:00

cables.xml

cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"

2016-06-07 17:09:34 +02:00

encoding.conf

update encoding.conf

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

epgmap.xml

add epg remaping

2016-05-10 14:00:37 +02:00

Makefile.am

COPKGManager: use config file for bad package detection

2015-12-28 12:13:51 +01:00

mk_terrestrial_xml.pl

add basic support for DVB-T

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

providermap.xml

providermap.xml : update

2012-04-24 12:18:36 +02:00

satellites.xml

data/satellites.xml update Astra19 Hotbird13

2016-04-18 17:55:02 +02:00

settingsupdate.conf

Software Update with apply the settings (Part13)

2013-01-01 15:05:21 +01:00

terrestrial.xml

add basic support for DVB-T

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

tobackup.conf

backup.sh: rename backup.list to tobackup.conf & move to /var/tuxbox/config/t (thx svenhoefer)

2011-12-06 13:33:26 +00:00