diff options
author | Liang Qi <liang.qi@qt.io> | 2019-07-23 11:05:11 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-07-23 11:06:12 +0200 |
commit | dbdcc1b099dc25ffb707a2441191463de33c51f3 (patch) | |
tree | 252495f053b0084da47894ce1daee460abe40718 /src/plugins/directshow/camera/dscameraimageprocessingcontrol.cpp | |
parent | 5825dd2773755cea236d9816cc7541bc20f9cb80 (diff) | |
parent | 32e49d634c5892ed98074cb3dd76a323357dfe54 (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/plugins/directshow/camera/dscameraimageprocessingcontrol.cpp')
0 files changed, 0 insertions, 0 deletions