[CST] Focus f7d6d1efc9 fix conflict ...

Origin commit data
------------------
Branch: ni/coolstream
Commit: 68201bad9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-16 (Fri, 16 Mar 2012)


------------------
No further description and justification available within origin commit message!

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

2012-03-16 14:11:06 +04:00

..

fonts

try to fix some problems with windows svn-clients

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

icons

neutrino: port personalize feature from tuxbox

2011-12-28 00:19:15 +00: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

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

locale

Merge branch 'master' into multituner

2012-03-02 18:59:50 +04:00

scripts

settings_manager & locale rework , thx svenhoefer

2012-02-24 20:59:51 +00:00

themes

tuxbox-port: modul files added

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

cables.xml

cables.xml: update Goetzschtalbruecke

2012-03-15 07:41:35 +00:00

encoding.conf

edvbstring: dont use ISO6937 as default

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

Makefile.am

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

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

satellites.xml

satellites: update Astra 1H/1KR/1L/1M (19.2E) & Hot Bird 6/8/9 (13.0E)

2012-01-17 17:13:54 +00: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