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

Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: c1803eacac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)

2017-01-29 21:32:04 +01:00

..

fonts

install additional fonts and use Roboto-Regular.ttf as new neutrino default font

2016-06-23 17:56:22 +02:00

icons

icons: better visibility for some icons

2017-01-05 23:07:58 +01:00

inetradio

NI \o/

2016-05-19 22:59:54 +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

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

2017-01-27 18:49:24 +01:00

neutrino-scripts

NI \o/

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

pictures

icons: move NI icons into categorized subdirectories

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

scripts

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

2017-01-29 21:30:01 +01:00

themes

themes: better visibility for progressbars

2017-01-05 23:42:23 +01:00

y-web

NI-yWeb: fix missing %(WEBTVDIR) replacement

2017-01-26 21:36:14 +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

cablex.xml: update Unitymedia; thx to klauser

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

encoding.conf

…

epglanguages.conf

NI \o/

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

epgmap.xml

add epg remaping

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

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

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

NI \o/

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