Stefan Seyfried 7e692549d3 Merge branch 'check/next-cc' ...

again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)



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

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

..

fonts

add font with simplified chinese support

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

icons

Merge branch 'check/next-cc'

2013-06-16 21:22:14 +02:00

inetradio

update radio-stations.xml (thx bazi98)

2011-02-17 11:45:52 +00:00

initial

add initial Astra 19e settings to install

2013-06-28 16:12:33 +04:00

iso-codes

Remove most exotic never seen languages from table, to cut upcoming prefered language menu; Full tab left for reference

2010-02-17 09:58:58 +00:00

lcd

optimize jpg,png size

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

license

slovak.license: fix license text (thx bazi98)

2013-06-20 12:43:18 +02:00

locale

Merge branch 'check/next-cc'

2013-07-06 19:01:15 +02: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

yweb: rework, localize and enable backup/restore

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

themes

tuxbox-port: modul files added

2010-11-27 23:16:38 +00:00

cables.xml

cables.xml: add "antennengemeinschaft penig"

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

encoding.conf

update encoding.conf by EnoSat

2013-05-10 16:59:56 +04:00

Makefile.am

Merge branch 'check/next-cc'

2013-07-06 19:01:15 +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-04-01 16:18:42 +04: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