git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cf3bc2 f389b26)
Merge branch 'bug_202_networkconfig_cleanup'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 06:10:39 +0000 (07:10 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 06:10:39 +0000 (07:10 +0100)
Conflicts:
lib/python/Screens/NetworkSetup.py


Trivial merge
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources