diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-09-26 14:17:32 +1000 |
|---|---|---|
| committer | Michael Goddard <michael.goddard@nokia.com> | 2011-09-26 14:17:32 +1000 |
| commit | be98375f90179be242a5d2fdcde043512f072462 (patch) | |
| tree | ea1cc76773e0ae385c53f32019da6150677e47b6 /config.tests | |
| parent | 247dcc770b7ff7d214ea889b83fd346d067278e8 (diff) | |
| parent | 1913f164dcb59b31d9a7be93311390410437eabb (diff) | |
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
Diffstat (limited to 'config.tests')
0 files changed, 0 insertions, 0 deletions