projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
875ad71
0fe25bf
)
Merge branch 'acid-burn/bug_622_swupgrade_networkcheck' into experimental
author
acid-burn
<acid-burn@opendreambox.org>
Tue, 23 Nov 2010 15:02:01 +0000
(16:02 +0100)
committer
acid-burn
<acid-burn@opendreambox.org>
Tue, 23 Nov 2010 15:02:01 +0000
(16:02 +0100)
1
2
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
Simple merge