diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:59:24 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:59:24 +0200 |
| commit | d691f5ca2b6749006673e199b1d668a6daa9b990 (patch) | |
| tree | eacad24192e1e0c492320e14bdfd7c3c203a01e0 /examples/multimediawidgets/camera/camera.cpp | |
| parent | d415d3256d055ef6fd7dad5c0497ecfaa56ee64d (diff) | |
| parent | 150ff6662de1312e3ba9d000895d80dd5805ea5b (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f
Diffstat (limited to 'examples/multimediawidgets/camera/camera.cpp')
0 files changed, 0 insertions, 0 deletions