git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6860090
0c26445
)
Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst'
author
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 9 Feb 2011 14:10:03 +0000
(15:10 +0100)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 9 Feb 2011 14:10:03 +0000
(15:10 +0100)
1
2
data/setup.xml
patch
|
diff1
|
diff2
|
blob
|
history
lib/dvb/tstools.cpp
patch
|
diff1
|
diff2
|
blob
|
history
lib/python/Components/UsageConfig.py
patch
|
diff1
|
diff2
|
blob
|
history
lib/python/Plugins/Extensions/DVDPlayer/plugin.py
patch
|
diff1
|
diff2
|
blob
|
history
lib/python/Screens/InfoBarGenerics.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
data/setup.xml
index f5dea734e2c77cab6c731cb3e0f0c737f77e981c,fa8ff3f9f687594b8167fd4506ab8b435e6171e5..c5eb07f5e5d447becb34367f1f0db394da7b6bd2
mode 100755,100644..100755
---
1
/
data/setup.xml
---
2
/
data/setup.xml
+++ b/
data/setup.xml
diff --cc
lib/dvb/tstools.cpp
Simple merge
diff --cc
lib/python/Components/UsageConfig.py
Simple merge
diff --cc
lib/python/Plugins/Extensions/DVDPlayer/plugin.py
Simple merge
diff --cc
lib/python/Screens/InfoBarGenerics.py
Simple merge
git.cweiske.de / enigma2.git / commitdiff