Merge branch 'radio' into 'master'
authorJonas Rabbe <jonas.rabbe@nokia.com>
Wed, 31 Aug 2011 03:09:47 +0000 (13:09 +1000)
committerJonas Rabbe <jonas.rabbe@nokia.com>
Wed, 31 Aug 2011 03:09:47 +0000 (13:09 +1000)
commit6781063df647fcba3dd5ca6fdff8631579acb495
treef505a6cadb9e8edd341b0105f47e051a6a597b5c
parent3bf236cc23c2e67e1b5cbc01e05e61263528fc10
parent8e954ee2462e827e88bbc27b1512d1e1422357fc
Merge branch 'radio' into 'master'

Change-Id: I86243b496b9fb42f828a67343dc576baa2c21ca0
src/imports/multimedia/multimedia.cpp
src/imports/multimedia/multimedia.pro