diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:34:21 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:34:21 +0200 |
commit | ba3a161c41eba3148d66bc5123707fcf613e2bcb (patch) | |
tree | a092b1400a82b86acee4e2771bfc2f27630f0261 /src/plugins/directshow/camera/dsvideodevicecontrol.h | |
parent | afca8928ce8e4113a224e57fa30a3b4bc5a2db47 (diff) | |
parent | 58a304824abbff8f1bf3d5031c1799de91869190 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/plugins/directshow/camera/dsvideodevicecontrol.h')
0 files changed, 0 insertions, 0 deletions