Merge commit '8eebcd73fcf118bb81f95563b312f925093d1bbe' into mm
authorMike Looijmans <milo-software@users.sourceforge.net>
Mon, 19 Sep 2011 16:34:06 +0000 (18:34 +0200)
committerMike Looijmans <milo-software@users.sourceforge.net>
Mon, 19 Sep 2011 16:34:06 +0000 (18:34 +0200)
Conflicts:
data/encoding.conf (ours)
lib/service/servicemp3.h (ours)

1  2 
data/encoding.conf
lib/gui/elistboxcontent.cpp
lib/python/Components/PluginComponent.py
lib/python/Plugins/Extensions/DVDBurn/Process.py
lib/python/Plugins/Plugin.py
lib/python/Screens/Standby.py
lib/service/servicedvd.cpp
lib/service/servicemp3.cpp
main/enigma.cpp

index 147006a,36f619d..147006a
mode 100644,100755..100755
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc main/enigma.cpp
Simple merge