Merge commit 'dm/experimental' into test branch
authorschon <schon@dev03-server>
Tue, 15 Mar 2011 07:05:31 +0000 (16:05 +0900)
committerschon <schon@dev03-server>
Tue, 15 Mar 2011 07:05:31 +0000 (16:05 +0900)
commite19feb6903e6054302080ae40d2bcfa5c2d1628e
tree6b22ae26c55c94a25ce6091fc4ef7c1bf9b04354
parent02ce374d98c657e43485ce8f5cdcf458856fe8da
parent06aa5f1288438421acd6b810296aff678524e004
Merge commit 'dm/experimental' into test branch

Conflicts:
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Screens/SleepTimerEdit.py
18 files changed:
RecordTimer.py
data/keymap.xml
lib/dvb/dvb.cpp
lib/dvb/frontend.cpp
lib/python/Plugins/Extensions/DVDBurn/Process.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py
lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Plugins/SystemPlugins/Videomode/plugin.py
lib/python/Screens/AudioSelection.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/PluginBrowser.py
lib/python/Screens/SleepTimerEdit.py
main/bsod.cpp