Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 20 Nov 2013 15:43:44 +0000 (16:43 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 20 Nov 2013 15:43:45 +0000 (16:43 +0100)
Change-Id: I25197ccc930730be363f8f65624d7fa10c1d33e9

1  2 
src/plugins/qnx/camera/bbcamerasession.cpp