git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79c46a3 f2381d0)
Merge branch 'bug_537_ignore_vob_pgs_subtitles' into 3.0
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 13 Dec 2010 11:18:57 +0000 (12:18 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 13 Dec 2010 11:18:57 +0000 (12:18 +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