Stefan Seyfried 13ac3b81eb Merge remote-tracking branch 'check/next-cc' ...

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: eca8f5459b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-19 (Sun, 19 Jan 2014)

2014-01-19 13:37:24 +01:00

..

fonts

add font with simplified chinese support

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

icons

set background of start/shutdown image to black

2014-01-05 20:04:54 +01:00

inetradio

…

initial

update initial astra frontend.conf, use same config as default

2013-07-30 11:13:50 +04:00

iso-codes

…

lcd

…

license

CImageInfo: rework some parts of imageinfo

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

locale

Merge remote-tracking branch 'check/next-cc'

2014-01-19 13:37:24 +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

…

cables.xml

cables.xml: update Kabel Deutschland - Offensive 2012

2014-01-13 18:12:54 +01:00

encoding.conf

update encoding.conf

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

Makefile.am

Merge branch 'check/next-cc'

2013-07-06 19:01:15 +02:00

mk_terrestrial_xml.pl

…

providermap.xml

…

satellites.xml

Update satellites.xml (THX Houdini)

2014-01-05 10:31:24 +01:00

settingsupdate.conf

…

terrestrial.xml

…

tobackup.conf

…