projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c72fb90
6a3f59e
)
Merge remote branch 'origin/acid-burn/bug_670_plugin_restartoption' into experimental
author
acid-burn
<acid-burn@opendreambox.org>
Tue, 8 Feb 2011 10:23:09 +0000
(11:23 +0100)
committer
acid-burn
<acid-burn@opendreambox.org>
Tue, 8 Feb 2011 10:23:09 +0000
(11:23 +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
diff --cc
lib/python/Plugins/Extensions/DVDPlayer/plugin.py
Simple merge
diff --cc
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
Simple merge