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

Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: c2506804b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)

2016-12-30 21:54:46 +01:00

..

fonts

…

icons

icons: small changes as suggested by NI-Team

2016-12-29 16:32:57 +01:00

inetradio

…

initial

…

iso-codes

…

lcd

…

license

…

locale

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

2016-12-30 21:54:46 +01:00

neutrino-scripts

…

pictures

icons: move NI icons into categorized subdirectories

2016-12-07 11:14:14 +01:00

scripts

…

themes

themes: upgrade our themes

2016-12-29 01:13:59 +01:00

y-web

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

2016-12-24 00:29:03 +01:00

bad_package_pattern.list.sample

…

cables.xml

cablex.xml: update Unitymedia; thx to klauser

2016-11-04 16:49:01 +01:00

encoding.conf

…

epglanguages.conf

…

epgmap.xml

…

Makefile.am

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

2016-12-15 14:12:33 +01:00

mk_terrestrial_xml.pl

…

providermap.xml

…

satellites.xml

…

settingsupdate.conf

…

terrestrial.xml

…

tobackup.conf

…

webtv_usr.xml

…