[CST] Focus a44ddd82ad fix conflicts: ...

adding hints is work in progress, so until most is finished,
please avoid sorting locals.h, locals_intern.h, english.locale.
to resolve i had to sort (real, case-insensitive) this files


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58d513d963
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)



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

2012-07-12 12:53:53 +04:00

..

fonts

try to fix some problems with windows svn-clients

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

icons

icon makefile

2012-07-10 18:35:18 +02: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

fix conflicts:

2012-07-12 12:53:53 +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 kms muenchen

2012-05-21 21:51:54 +02:00

encoding.conf

edvbstring: dont use ISO6937 as default

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

Makefile.am

add sample providermap.xml

2012-01-26 17:35:10 +04:00

providermap.xml

providermap.xml : update

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

satellites.xml

satellites.xml: update Hotbird13

2012-05-03 10:56:00 +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