diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 12:40:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 12:40:46 +0100 |
| commit | 7ab948c7259d9a856a0b0c52897cb430731494c3 (patch) | |
| tree | d22604c0877097e66c1efd9a0fdc328094d9844c /src/multimedia/camera | |
| parent | c1164f874a21959d03893f62db8f8e2def44122d (diff) | |
| parent | 544a8a4251ff9694780e563ddb6e4af1325e0115 (diff) | |
| download | qtmultimedia-7ab948c7259d9a856a0b0c52897cb430731494c3.tar.gz | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
src/multimedia/configure.json
Change-Id: Ide124447e1667f0b6557b6ab1ba7188ae76772c5
Diffstat (limited to 'src/multimedia/camera')
0 files changed, 0 insertions, 0 deletions