vanhofen f7614da769 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox ...

Conflicts:
	src/gui/moviebrowser/mb.cpp
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 30e1c0ef71
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)



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

2016-10-29 12:45:02 +02:00

..

fonts

install additional fonts and use Roboto-Regular.ttf as new neutrino default font

2016-06-23 17:56:22 +02:00

icons

icons: transparent background for clock_face icon

2016-08-22 17:47:39 +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

optimize jpg,png size

2012-08-08 17:10:12 +02:00

license

NI \o/

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

locale

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

2016-10-29 12:45:02 +02:00

neutrino-scripts

NI \o/

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

scripts

data/scripts/backup.sh: don't use $(hostname) in $DATE variable

2016-06-01 21:03:25 +02:00

themes

themes: add three new material themes

2016-08-23 15:12:02 +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

cables.xml: update Antennengemeinschaft "Goeltzschtalbruecke"

2016-06-07 17:09:34 +02:00

encoding.conf

update encoding.conf

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

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

NI \o/

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

mk_terrestrial_xml.pl

add basic support for DVB-T

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

providermap.xml

providermap.xml : update

2012-04-24 12:18:36 +02:00

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

webtv_usr.xml

NI \o/

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