git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8eebcd7 a7af14d)
Merge branch 'master' into bug_374_missingcodecwarning master-2011.03
authorFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 24 Feb 2011 09:52:22 +0000 (10:52 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 24 Feb 2011 09:52:22 +0000 (10:52 +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