projects / vuplus_dvbapp / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 67a9cce d6e258a)
Merge commit 'origin/bug_138_networkwizard_fixes' into experimental
authorMladen Horvat <acid-burn@opendreambox.org>
Wed, 9 Dec 2009 20:37:50 +0000 (21:37 +0100)
committerMladen Horvat <acid-burn@opendreambox.org>
Wed, 9 Dec 2009 20:37:50 +0000 (21:37 +0100)
commit4588321e0ee8151324a5a183ff2ced5ea80629cf
treef4c4cee47eb1a9ef5f013d5716523300fd37428dtree | snapshot
parent67a9cce495c089020439834bb27cd148296c3655commit | diff
parentd6e258a761abb1074a1157d17b9c42b7f28959cecommit | diff
Merge commit 'origin/bug_138_networkwizard_fixes' into experimental

Conflicts:
lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.