Stefan Seyfried fbee2df820 Merge branch 'uncool/dvbsi++' ...

Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


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



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

2012-11-11 01:45:22 +01:00

..

fonts

…

icons

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

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

inetradio

…

iso-codes

…

lcd

optimize jpg,png size

2012-08-08 17:10:12 +02:00

locale

Merge branch 'uncool/dvbsi++'

2012-11-11 01:45:22 +01:00

scripts

yweb: rework, localize and enable backup/restore

2012-07-21 23:31:59 +02:00

themes

…

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 astra 19.2

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

settingsupdate.conf

Software Update with apply the settings (Part6)

2012-11-03 16:19:29 +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