diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-08 03:00:24 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-08 03:00:24 +0200 |
| commit | 1ca79e8645f9f3cf471c32cf9fd2894a4b41bcb1 (patch) | |
| tree | b35436ae81924383c43f03f0fc00e6a72ebe6cb3 /src/plugins/directshow/camera/dsvideodevicecontrol.h | |
| parent | 871a097d0c6e8203f82b398e21dcfd8151bdae27 (diff) | |
| parent | c5400d31a40847e2905b11759090400653624a94 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1
Change-Id: I886c4bda70a2b5a013a445d03487c7e3ef98e858
Diffstat (limited to 'src/plugins/directshow/camera/dsvideodevicecontrol.h')
0 files changed, 0 insertions, 0 deletions