git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 4588321 f741c4c)
Merge commit 'origin/bug_202_networkconfig_cleanup' into experimental
authorMladen Horvat <acid-burn@opendreambox.org>
Thu, 10 Dec 2009 10:13:30 +0000 (11:13 +0100)
committerMladen Horvat <acid-burn@opendreambox.org>
Thu, 10 Dec 2009 10:13:30 +0000 (11:13 +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