Merge branch 'bug_537_vobsub' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 10 Dec 2010 11:33:53 +0000 (12:33 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 10 Dec 2010 11:33:53 +0000 (12:33 +0100)
commit59fb353ca955f4d6806938fccbe3100cee86b902
tree930fc65ce745779630c1964fc1f92ec48cd262dd
parent322f606a88150a635adf7b42da6a96667aed0058
parent85cf8dd019e8c44fb42802b01efb0677f328fa7c
Merge branch 'bug_537_vobsub' into experimental
lib/service/servicemp3.cpp
lib/service/servicemp3.h