Stefan Seyfried 51bbad3ab1 Merge branch 'check/pu-cc' into master ...

Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 61bf95f552
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)

2013-04-13 17:17:30 +02:00

..

fonts

…

icons

Merge branch 'check/next' into master

2013-03-07 17:10:11 +01:00

inetradio

…

iso-codes

…

lcd

optimize jpg,png size

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

license

Imageinfo: Format license text

2013-03-19 11:54:57 +01:00

locale

Merge branch 'check/pu-cc' into master

2013-04-13 17:17:30 +02:00

scripts

yweb: rework, localize and enable backup/restore

2012-07-21 23:31:59 +02:00

themes

…

cables.xml

cables.xml: add "antennengemeinschaft penig"

2013-01-31 17:28:18 +01:00

encoding.conf

edvbstring: dont use ISO6937 as default

2011-12-25 13:32:19 +00:00

Makefile.am

Merge branch 'check/pu-cc' into master

2013-04-06 11:21:55 +02:00

mk_terrestrial_xml.pl

add basic support for DVB-T

2012-10-07 17:09:17 +02:00

providermap.xml

providermap.xml : update

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

satellites.xml

data/satellites.xml: update Eurobird 9A (9.0E)

2013-03-26 11:52:21 +01: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

2012-10-07 17:09:17 +02:00

tobackup.conf

backup.sh: rename backup.list to tobackup.conf & move to /var/tuxbox/config/t (thx svenhoefer)

2011-12-06 13:33:26 +00:00