Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:15:45 +0000 (13:15 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:15:45 +0000 (13:15 +0200)
commit0ef52f01029176a8fb8fbef2c22ae9350635ebe1
treefad805097d0e40ba57dcfb61ac3067737c7a2ae3
parentcb324a50c920b275ef6c04162712b1a6f19bbe8d
parent5c087bb6153b951e1c5709ee7f998819d08a6122
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c
src/imports/multimedia/qdeclarativevideooutput.cpp
src/multimedia/multimedia.pro