vanhofen bb2b748ea3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33857873dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)



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

2017-10-14 07:15:30 +02:00

..

fonts

fonts: add ubuntumono-r-webfont.ttf

2017-06-07 14:07:08 +02:00

icons

add UHD icons to infoviewer

2017-10-13 14:10:34 +02:00

inetradio

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

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

initial

…

iso-codes

…

lcd

…

license

…

locale

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-10-14 07:15:30 +02:00

neutrino-scripts

…

pictures

pictures: re-add familiar shutdown picture

2017-03-15 09:47:07 +01:00

scripts

NI-code: Rename hardware defined macros for coolstream stb

2017-02-12 21:57:06 +01:00

themes

themes: add new shadow-color to our material themes

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

webtv

webtv: update filmon.xml

2017-08-31 15:12:58 +02:00

y-web

yWeb: fix manual selection of remote control

2017-10-13 18:40:49 +02:00

bad_package_pattern.list.sample

…

cables.xml

cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"

2017-05-17 17:23:22 +02:00

encoding.conf

…

epglanguages.conf

…

epgmap.xml

…

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

…

settingsupdate.conf

…

terrestrial.xml

…

tobackup.conf

…

webtv_usr.xml

…