git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2be314 996081f)
Merge commit 'origin/bug_558_wlanfixes'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 10:57:56 +0000 (12:57 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 10:57:56 +0000 (12:57 +0200)
Conflicts:
lib/python/Components/Network.py


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