git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25cd1a7 53c44df)
Merge branch 'master' into 3.0
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 15 Nov 2010 20:10:22 +0000 (21:10 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 15 Nov 2010 20:10:22 +0000 (21:10 +0100)

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