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

Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: c35e647878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-07 (Thu, 07 Dec 2017)

2017-12-07 12:17:23 +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

icons: cleanup from unused icons

2017-12-01 14:26:33 +01:00

inetradio

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

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

initial

…

iso-codes

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

2017-12-07 12:17:23 +01:00

lcd

…

license

…

locale

add DVB-S2X support

2017-12-06 10:47:36 +01:00

neutrino-scripts

flash.start: minor changes in script comments

2017-11-23 17:23:01 +01:00

pictures

use bootlogo in gray color

2017-10-20 08:02:09 +02:00

scripts

add webradio; first steps

2017-11-03 09:36:19 +01: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/mp/tuxbox

2017-12-07 12:17:23 +01:00

bad_package_pattern.list.sample

…

cables.xml

cablex.xml: add OstTelCom; thx to elstablo

2017-11-25 21:20:24 +01:00

encoding.conf

…

epglanguages.conf

data: add missing epglanguages.conf

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

epgmap.xml

…

Makefile.am

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

2017-11-16 22:05:24 +01:00

mk_terrestrial_xml.pl

…

providermap.xml

…

satellites.xml

…

settingsupdate.conf

…

terrestrial.xml

…

tobackup.conf

…

webradio_usr.xml

fill webradio_usr.xml with some of my favorite streams

2017-11-16 19:43:26 +01:00

webtv_usr.xml

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

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