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

Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)



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

2017-05-16 15:28:08 +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

…

initial

…

iso-codes

…

lcd

…

license

…

locale

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

2017-05-16 15:28:08 +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: 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

…

cables.xml

cables.xml: update WTC SN; thanks to Gorcon

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

…