Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:50:11 +0000 (19:50 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 4 Jun 2013 17:50:11 +0000 (19:50 +0200)
commit9785766067aea72da13b1c7821295254d4fabb78
tree566c94b7074fbbffaf18e01eaf0c4f988744c712
parent0ef52f01029176a8fb8fbef2c22ae9350635ebe1
parent3d45b9147ec93c4af38aef5e6ab2302681bb1425
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
sync.profile

Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
src/multimedia/multimedia.pro