Merge commit 'dm/experimental' into test_1130
authorschon <schon@dev03-server>
Tue, 30 Nov 2010 05:01:22 +0000 (14:01 +0900)
committerschon <schon@dev03-server>
Tue, 30 Nov 2010 05:01:22 +0000 (14:01 +0900)
commitbe4aa74e26480dc08d7eb4ea2565fc02d0b1e414
treed10ff81deb4c9619f9e03f79cc969e8345ef226b
parentb88c2ce5fe228b07bdfe6e027762553bba4c5665
parent1b50c31e8c9a2d690500feac0065fd1ace941c80
Merge commit 'dm/experimental' into test_1130

Conflicts:
acinclude.m4
lib/driver/Makefile.am
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
main/bsod.cpp
po/ar.po
po/ca.po
po/cs.po
po/da.po
po/de.po
po/el.po
po/en.po
po/enigma2.pot
po/es.po
po/et.po
po/fi.po
po/fr.po
po/fy.po
po/hr.po
po/hu.po
po/is.po
po/it.po
po/lt.po
po/lv.po
po/nl.po
po/no.po
po/pl.po
po/pt.po
po/ru.po
po/sk.po
po/sl.po
po/sr.po
po/sv.po
po/tr.po
po/uk.po
21 files changed:
configure.ac
data/setup.xml
data/skin.xml
lib/driver/Makefile.am
lib/dvb/dvb.cpp
lib/dvb/frontend.cpp
lib/gdi/glcddc.cpp
lib/gdi/lcd.cpp
lib/python/Components/Harddisk.py
lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
lib/python/Plugins/SystemPlugins/NFIFlash/downloader.py
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/Wizard.py
lib/python/enigma_python.i
lib/service/servicedvb.cpp
main/bsod.cpp