Merge branch 'mmfphonon' into 4.6
authorFrans Englich <frans.englich@nokia.com>
Wed, 10 Mar 2010 13:13:58 +0000 (14:13 +0100)
committerFrans Englich <frans.englich@nokia.com>
Wed, 10 Mar 2010 13:13:58 +0000 (14:13 +0100)
commit28fc7434e0be95527292050bc6dd3980aabd44ca
tree4d79e9fe39985176c2cd41c9e0b2dca54d8044b6
parent032d4ac63687d209ffef594bf6ef60e3db20bfa3
parent64cd7dea0e2f3d6544e6cc47ccd857b1ce3d44e7
Merge branch 'mmfphonon' into 4.6
tests/auto/mediaobject/tst_mediaobject.cpp