diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:07:26 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:07:26 +0200 |
commit | e535480e13c2ba0483f4a25be90c5db82529c25c (patch) | |
tree | 9f558d4bb3392e75cfedad48bfd4315c77c2043e /tests/auto/integration/qcamerabackend/qcamerabackend.pro | |
parent | e2adbda766f5fbdc6238cbd6bc64a6d3383c844e (diff) | |
parent | 20686cb51fb2dfa5973d636875e9fc20c2bde4f5 (diff) |
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Change-Id: Ibf6ca6de08694f80a586c05953a21b151c7b051a
Diffstat (limited to 'tests/auto/integration/qcamerabackend/qcamerabackend.pro')
0 files changed, 0 insertions, 0 deletions