Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Feb 2014 13:11:35 +0000 (14:11 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 12 Feb 2014 13:11:35 +0000 (14:11 +0100)
Change-Id: Ie93615076177662e75d46f3d13beeb88d424b4a6

1  2 
src/plugins/directshow/camera/dscamerasession.cpp
src/plugins/plugins.pro

Simple merge