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)
Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c

1  2 
src/imports/multimedia/qdeclarativevideooutput.cpp
src/multimedia/multimedia.pro

Simple merge