vanhofen 28376259c1 Merge branch 'master' into pu/mp ...

Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 064f693bf7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)



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

2017-04-08 14:36:12 +02:00

..

fonts

configure: Rename hardware defined macros for coolstream stb

2017-02-12 09:21:04 +01:00

icons

icons: re-add some familiar icons

2017-03-15 09:47:07 +01:00

inetradio

…

initial

update initial services

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

iso-codes

…

lcd

…

license

CImageInfo: rework some parts of imageinfo

2013-11-11 00:20:10 +01:00

locale

Merge branch 'master' into pu/mp

2017-04-08 14:36:12 +02:00

neutrino-scripts

…

pictures

pictures: re-add familiar shutdown picture

2017-03-15 09:47:07 +01:00

scripts

install.sh: Preserve symlinks at update

2017-01-29 04:31:12 +01:00

themes

add Bluemoon-3.0.theme

2016-04-05 17:42:57 +02:00

y-web

yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup

2017-03-01 11:51:25 +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

…

epgmap.xml

add epg remaping

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

Makefile.am

yWeb: move data from /src to /data

2016-12-15 14:00:45 +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

…

terrestrial.xml

add basic support for DVB-T

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

tobackup.conf

…