Merge branch 'bug_537_vobsub' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 2 Dec 2010 10:29:40 +0000 (11:29 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 2 Dec 2010 10:29:40 +0000 (11:29 +0100)
1  2 
lib/service/servicemp3.cpp
lib/service/servicemp3.h

Simple merge
Simple merge