diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:37:55 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:37:55 +0200 |
commit | 2de952fbd9843046e0612f1eaf257c9de94c966e (patch) | |
tree | 8ed82d62688ff9cb75ad446a78b1fdc2135429f3 /src/plugins/gstreamer/camerabin/camerabincontrol.cpp | |
parent | 8972b26890b9c4d7e82cc47a4864fda0a8a78ff4 (diff) | |
parent | d4a3e85eb86d551bdbeae973ab59c1fcee09393e (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Ic16cafaf6df356e430db4d60ad95610c855e1042
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabincontrol.cpp')
0 files changed, 0 insertions, 0 deletions