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

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b76adcc02
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



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

2017-05-08 23:50:19 +02:00

..

fonts

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

2017-02-12 21:54:48 +01:00

icons

icons: add new icons for epg-button

2017-05-08 17:39:34 +02: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 'ni/tuxbox' into ni/mp/tuxbox

2017-04-08 14:33:53 +02:00

neutrino-scripts

NI \o/

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

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: better visibility for progressbars

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

y-web

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

2017-03-01 13:09:50 +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

cables.xml: update WTC SN; thanks to Gorcon

2017-03-23 12:23:56 +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