git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
67a9cce
d6e258a
)
Merge commit 'origin/bug_138_networkwizard_fixes' into experimental
author
Mladen Horvat
<acid-burn@opendreambox.org>
Wed, 9 Dec 2009 20:37:50 +0000
(21:37 +0100)
committer
Mladen Horvat
<acid-burn@opendreambox.org>
Wed, 9 Dec 2009 20:37:50 +0000
(21:37 +0100)
Conflicts:
lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
1
2
lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
Simple merge
git.cweiske.de / enigma2.git / commitdiff