Merge branch 'camera' of ssh://codereview.qt-project.org:29418/qt/qtmultimediakit
authorMichael Goddard <michael.goddard@nokia.com>
Mon, 26 Sep 2011 04:17:32 +0000 (14:17 +1000)
committerMichael Goddard <michael.goddard@nokia.com>
Mon, 26 Sep 2011 04:17:32 +0000 (14:17 +1000)
commitbe98375f90179be242a5d2fdcde043512f072462
treeea1cc76773e0ae385c53f32019da6150677e47b6
parent247dcc770b7ff7d214ea889b83fd346d067278e8
parent1913f164dcb59b31d9a7be93311390410437eabb
Merge branch 'camera' of ssh://codereview.qt-project.org:29418/qt/qtmultimediakit

Conflicts:
src/imports/multimedia/multimedia.cpp
src/imports/multimedia/multimedia.pro

Change-Id: I9d4bc1aa65f89ac24dd12c1e2c21a02f49913e13
src/imports/multimedia/multimedia.cpp
src/imports/multimedia/multimedia.pro