Stefan Seyfried 58ca3266e7 Merge branch 'uncool/dvbsi++' commit '9d1444a8df5' ...

...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



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

2012-11-03 10:45:33 +01:00

..

fonts

try to fix some problems with windows svn-clients

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

icons

Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'

2012-11-03 10:45:33 +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 'uncool/dvbsi++' commit '9d1444a8df5'

2012-11-03 10:45:33 +01: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 new transponders for Unitymedia

2012-10-06 18:40:30 +02:00

encoding.conf

edvbstring: dont use ISO6937 as default

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

Makefile.am

Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'

2012-11-03 10:45:33 +01:00

mk_terrestrial_xml.pl

add basic support for DVB-T

2012-10-07 17:09:17 +02:00

providermap.xml

providermap.xml : update

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

satellites.xml

satellites.xml: update hotbird13

2012-10-19 12:21:47 +02:00

settingsupdate.conf

Software Update with apply the settings (Part1)

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

terrestrial.xml

add basic support for DVB-T

2012-10-07 17:09:17 +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