Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' into experimental

author acid-burn <acid-burn@opendreambox.org>

Tue, 8 Feb 2011 10:33:26 +0000 (11:33 +0100)

committer acid-burn <acid-burn@opendreambox.org>

Tue, 8 Feb 2011 10:33:26 +0000 (11:33 +0100)
author acid-burn <acid-burn@opendreambox.org>
Tue, 8 Feb 2011 10:33:26 +0000 (11:33 +0100)
committer acid-burn <acid-burn@opendreambox.org>
Tue, 8 Feb 2011 10:33:26 +0000 (11:33 +0100)
diff --cc lib/python/Plugins/Extensions/DVDPlayer/plugin.py

index 1cee0aa,eaf8db6..1cee0aa

mode 100755,100644..100644
--- 1/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
--- 2/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
diff --cc lib/python/Plugins/Extensions/MediaPlayer/plugin.py

index 6ff1c5a,b44a247..6ff1c5a

mode 100755,100644..100644
--- 1/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
--- 2/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
author	acid-burn <acid-burn@opendreambox.org>
	Tue, 8 Feb 2011 10:33:26 +0000 (11:33 +0100)
committer	acid-burn <acid-burn@opendreambox.org>
	Tue, 8 Feb 2011 10:33:26 +0000 (11:33 +0100)
		1	2
lib/python/Plugins/Extensions/DVDPlayer/plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history
lib/python/Plugins/Extensions/MediaPlayer/plugin.py	patch \|	diff1 \|	diff2 \|	blob \| history