projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
155cecc
710962d
)
Merge remote branch 'origin/acid-burn/network_changes_next' into experimental
author
Mladen Horvat
<acid-burn@opendreambox.org>
Thu, 14 Apr 2011 18:41:17 +0000
(20:41 +0200)
committer
Mladen Horvat
<acid-burn@opendreambox.org>
Thu, 14 Apr 2011 18:41:17 +0000
(20:41 +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