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

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: eee55893c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)



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

2017-01-05 23:07:16 +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: rework channel-status icons

2017-01-02 23:54:36 +01:00

inetradio

NI \o/

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

initial

update initial services

2015-01-02 18:58:46 +01:00

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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-01-05 23:07:16 +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

data/scripts/backup.sh: don't use $(hostname) in $DATE variable

2016-06-01 21:03:25 +02:00

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

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

update encoding.conf

2013-08-08 15:51:47 +02:00

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

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

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

add basic support for DVB-T

2014-02-28 13:44:22 +04:00

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