[CST] Focus ddc00bba81 Merge branch 'pip' into next ...

Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 69b4d366af
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)

2013-02-28 16:45:41 +04:00

..

fonts

…

icons

Merge branch 'pip' into next

2013-02-28 16:45:41 +04: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

locale

Merge branch 'pip' into next

2013-02-28 16:45:41 +04: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

Software Update with apply the settings (Part1)

2012-10-25 01:10:35 +01:00

providermap.xml

providermap.xml : update

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

satellites.xml

update astra

2012-12-04 19:57:30 +01: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