git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5d1c5e 597d64c)
Merge branch '2_5_to_2_6_bug_107' 2.6.0
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 2 Nov 2009 15:00:05 +0000 (16:00 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 2 Nov 2009 15:00:05 +0000 (16:00 +0100)
1  2 
lib/service/servicemp3.cpp patch | diff1 | diff2 | blob | history

diff --cc lib/service/servicemp3.cpp
Simple merge
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources