Thilo Graf 4aa0dca60b Merge branch 'master' into pu/msgbox ...

Conflicts:
 	src/gui/followscreenings.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e8c700dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
Merge branch 'master' into pu/msgbox

Conflicts:
  	src/gui/followscreenings.cpp


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

2016-11-15 19:49:27 +01:00

..

fonts

add font with simplified chinese support

2013-06-11 17:46:05 +04:00

icons

install tmdb.png

2016-03-10 11:15:22 +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/msgbox

2016-11-15 19:49:27 +01:00

neutrino-scripts

Software update: Copy flashimage to /tmp if it is not present in this directory

2013-06-13 01:36:03 +02:00

scripts

…

themes

add Bluemoon-3.0.theme

2016-04-05 17:42:57 +02: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

epgmap.xml

add epg remaping

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

Makefile.am

COPKGManager: use config file for bad package detection

2015-12-28 12:13:51 +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

Software Update with apply the settings (Part13)

2013-01-01 15:05:21 +01:00

terrestrial.xml

add basic support for DVB-T

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

tobackup.conf

…