Merge branch 'bug_537_ignore_vob_pgs_subtitles' into master
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 19 Feb 2011 12:24:47 +0000 (13:24 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 19 Feb 2011 12:26:48 +0000 (13:26 +0100)
1  2 
lib/python/Screens/AudioSelection.py
lib/service/servicemp3.cpp
lib/service/servicemp3.h

Simple merge
Simple merge
Simple merge