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

Conflicts:
	data/Makefile.am
	src/driver/rcinput.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h
	src/zapit/src/capmt.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fcd6b905ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-16 (Thu, 16 Nov 2017)



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

2017-11-16 22:05:24 +01:00

..

fonts

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

2017-11-02 23:25:41 +01:00

icons

infoviewer_bb: minor change in icon handling

2017-11-14 21:27:43 +01:00

inetradio

radio-stations.xml: add some Radio BOB! streams

2017-09-25 11:25:52 +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

vfd-setup: allow to set scroll_repeats if possible

2017-11-16 20:39:34 +01:00

neutrino-scripts

NI \o/

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

pictures

use bootlogo in gray color

2017-10-20 08:02:09 +02:00

scripts

add webradio; first steps

2017-11-03 09:36:19 +01:00

themes

themes: add new shadow-color to our material themes

2017-08-12 13:51:00 +02:00

webtv

add hd51; mostly ported from TangoCash's neutrino-mp

2017-10-29 18:31:30 +01:00

y-web

yweb: optimize png images for size

2017-11-16 19:43:26 +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: use german umlauts for german nets; ...

2017-11-16 19:43:26 +01:00

encoding.conf

update encoding.conf

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

epglanguages.conf

data: add missing epglanguages.conf

2017-10-29 18:32:21 +01: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/mp/tuxbox

2017-11-16 22:05:24 +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

webradio_usr.xml

fill webradio_usr.xml with some of my favorite streams

2017-11-16 19:43:26 +01:00

webtv_usr.xml

add hd51; mostly ported from TangoCash's neutrino-mp

2017-10-29 18:31:30 +01:00