[CST] Bas fe727eb954 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo ...

Conflicts:
	src/nhttpd/yhttpd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)



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

2012-12-07 14:39:05 +08:00

..

fonts

try to fix some problems with windows svn-clients

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

icons

icons: introduce new icons

2012-11-30 13:55:34 +01: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 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

2012-12-07 14:39:05 +08: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: update um and kms

2012-11-13 20:00:10 +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

satellites.xml: update astra 19.2

2012-11-05 14:06:24 +01:00

settingsupdate.conf

Software Update: /var/etc/update.urls is excluded from saving

2012-11-19 12:47:31 +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