projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
71dd5b3
8ea52b0
)
Merge remote-tracking branch 'origin/obi/master-20110412'
author
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 7 Sep 2011 10:25:04 +0000
(12:25 +0200)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Wed, 7 Sep 2011 10:25:04 +0000
(12:25 +0200)
1
2
lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/python/Plugins/SystemPlugins/SoftwareManager/BackupRestore.py
Simple merge