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)
commit30da484f79db1d8210a3dcb31b359484873dc240
tree2de3df8c9c7568d894669afbab0c914bc04d2bab
parentd537344ecb27f6d215f1f7b37a7e48b0a3ce2476
parentb9c0b3c8ec8c7979848126d9c88764043d685d26
Merge branch 'bug_537_vobsub' into experimental
lib/service/servicemp3.cpp
lib/service/servicemp3.h