vanhofen e76e443477 fix last merge #2 ...

Origin commit data
------------------
Branch: ni/coolstream
Commit: c1cea39c1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix last merge #2

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

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

2017-11-03 00:10:32 +01:00

..

fonts

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

2017-11-02 23:25:41 +01:00

icons

add hd51; mostly ported from TangoCash's neutrino-mp

2017-10-29 18:31:30 +01:00

inetradio

radio-stations.xml: add some Radio BOB! streams

2017-09-25 11:25:52 +02:00

initial

…

iso-codes

NI \o/

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

lcd

…

license

NI \o/

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

locale

fix last merge #2

2017-11-03 00:10:32 +01:00

neutrino-scripts

NI \o/

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

pictures

data/pictures: add new default background/start image

2017-10-17 20:02:16 +02:00

scripts

backup.sh: add /var/httpd

2017-10-25 14:08:50 +02:00

themes

themes: add new shadow-color to our material themes

2017-08-12 13:51:00 +02:00

webtv

add hd51; mostly ported from TangoCash's neutrino-mp

2017-10-29 18:31:30 +01:00

y-web

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

2017-11-02 23:25:41 +01: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 Unitymedia BW (former Kabel BW) - rearrangement channels, October 2017

2017-10-29 18:34:28 +01:00

encoding.conf

…

epglanguages.conf

data: add missing epglanguages.conf

2017-10-29 18:32:21 +01:00

epgmap.xml

add epg remaping

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

Makefile.am

add webtv-scripts/sources to neutrino-repo; will be auto-loaded at start

2017-08-31 08:59:06 +02:00

mk_terrestrial_xml.pl

…

providermap.xml

…

satellites.xml

data/satellites.xml update Astra19 Hotbird13

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

settingsupdate.conf

NI \o/

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

terrestrial.xml

…

tobackup.conf

NI \o/

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

webtv_usr.xml

add hd51; mostly ported from TangoCash's neutrino-mp

2017-10-29 18:31:30 +01:00