Merged in DummyPlayer changes
authorGareth Stockwell <gareth.stockwell@sosco.com>
Wed, 19 Aug 2009 11:57:27 +0000 (12:57 +0100)
committerGareth Stockwell <gareth.stockwell@sosco.com>
Wed, 19 Aug 2009 11:57:27 +0000 (12:57 +0100)
commitd9e03376f9f82e5664dfd2446ff4c05e35ffb535
tree711f77f7d307c05a3ae310b1fd59bbce74bd8eab
parent98d4c657803d5f1956560bd9b62e73f15c05e8fd
parentca0b5b503e8865c0eedeea86aa132291281fc49f
Merged in DummyPlayer changes
src/3rdparty/phonon/mmf/abstractplayer.h
src/3rdparty/phonon/mmf/mediaobject.cpp
src/plugins/phonon/mmf/mmf.pro