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

needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)

2013-05-24 20:24:39 +02:00

..

fonts

…

icons

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

2013-05-10 10:06:47 +02:00

inetradio

update radio-stations.xml (thx bazi98)

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

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 remote-tracking branch 'check/next-cc'

2013-05-24 20:24:39 +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

update encoding.conf by EnoSat

2013-05-01 11:47:10 +02: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-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