git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
485ad5f
0fe25bf
)
Merge remote branch 'remotes/origin/acid-burn/bug_622_swupgrade_networkcheck'
author
ghost
<andreas.monzner@multimedia-labs.de>
Mon, 13 Dec 2010 12:23:15 +0000
(13:23 +0100)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Mon, 13 Dec 2010 12:23:15 +0000
(13:23 +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