diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:06:47 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-12 13:06:47 +0100 |
commit | dbcf6d7f0209df2faf1c50c253af490ddcc96930 (patch) | |
tree | f38b6f894838c377936f4ac5e300288c1ea5672a /src/plugins/avfoundation/camera/avfcameraexposurecontrol.mm | |
parent | 923c2ab674d903d5c71254bf127d2784d3cc6980 (diff) | |
parent | 4395fed2b35dd12bb9bde5e20d91908d28196a06 (diff) |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I397c78d33594f4b64d9718cd1b180fa0cee1e5bc
Diffstat (limited to 'src/plugins/avfoundation/camera/avfcameraexposurecontrol.mm')
0 files changed, 0 insertions, 0 deletions