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)
commitc6ec402d257dfc49a98d2f88989b6dfee7bc4e8a
tree92a278d08342bb85e2fe18d2ea78d66530984aca
parent7a02bcaad18d7aa133944a23f863c2f9efcbf5fe
parentdb7f7cc5654ddec60297259bc9f86f5f777749cd
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ie93615076177662e75d46f3d13beeb88d424b4a6
src/plugins/directshow/camera/dscamerasession.cpp
src/plugins/plugins.pro