[CST] Focus 8bb70d1ab3 Merge branch 'pu/cc' into next-cc ...

Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h

2013-04-17 13:32:12 +04:00

..

fonts

- try to fix some problems with windows svn-clients

2010-05-11 16:05:19 +00:00

icons

data/icons/Makefile.am: add icons for tuner 3/4

2013-03-27 19:41:47 +04:00

inetradio

-update radio-stations.xml (thx bazi98)

2011-02-17 11:45:52 +00: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

* Imageinfo: Format license text

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

locale

Merge branch 'pu/cc' into next-cc

2013-04-17 13:32:12 +04: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

edvbstring: dont use ISO6937 as default

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

Makefile.am

create zapit config dir on install

2013-04-01 15:43:08 +04: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

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