From: acid-burn Date: Fri, 11 Feb 2011 12:32:34 +0000 (+0100) Subject: Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' X-Git-Tag: experimental-2011.03~6^2~7 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/cdb8a973f09efb2d42875d7854edba9a411719ff Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' --- cdb8a973f09efb2d42875d7854edba9a411719ff diff --cc lib/python/Plugins/Extensions/DVDPlayer/plugin.py index 1f3de1ac,eaf8db64..1cee0aac mode 100755,100644..100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py