fix merge error (caused by the vob subtitle bug merge)
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 19 Feb 2011 14:22:59 +0000 (15:22 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 19 Feb 2011 14:22:59 +0000 (15:22 +0100)
commit6d411cf25bf9d283ab220be1d7af72e585af74d2
tree52e53d62af135b8734fad10b44919cedcc25fb6b
parent5542743a96cff0772577e445a93384d07c291b91
fix merge error (caused by the vob subtitle bug merge)
lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp