projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ac065de
16902de
)
Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental
author
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 24 Nov 2010 23:12:59 +0000
(
00:12
+0100)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 24 Nov 2010 23:12:59 +0000
(
00:12
+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
f5dea73
,
fa8ff3f
..
c5eb07f
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
projects / vuplus_dvbapp / commitdiff