diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:00:31 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:00:31 +0100 |
commit | 365e05bad8c4a42a449eeef257a16c6f8faca318 (patch) | |
tree | 6e1b17ccad9fe81a1007ff2301a6873c72b22759 /src/plugins/directshow/camera/dscameraimageprocessingcontrol.cpp | |
parent | 02b8c7527a88d1cfaed296b856fce63fd62a6c9e (diff) | |
parent | 42dc97388137b753fbe7dc77371a51dfbd98d127 (diff) | |
download | qtmultimedia-365e05bad8c4a42a449eeef257a16c6f8faca318.tar.gz |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I6d88b17f44479a522d181374023648dd007112bd
Diffstat (limited to 'src/plugins/directshow/camera/dscameraimageprocessingcontrol.cpp')
0 files changed, 0 insertions, 0 deletions