Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorYoann Lopes <yoann.lopes@digia.com>
Thu, 30 Jan 2014 13:32:29 +0000 (14:32 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 30 Jan 2014 13:32:29 +0000 (14:32 +0100)
commit67b86a9fbd87fb50e896bf66313c2f949501df5b
tree999c6c5c3b9f5c8961d17fd18cca35ff7db83edb
parent5980bc41cf55073e63236467466a59577d406937
parent9459acf48eaa9326e58bb1658408d045482a573b
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
src/plugins/gstreamer/camerabin/camerabinsession.h
tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp