diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-10 03:00:22 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-10 03:00:22 +0100 |
commit | 2845e10810a50d6cba4f19a27cfefac10b06929a (patch) | |
tree | 401c55c67916af7b6c1e8b22ba0a8eb19667ece9 /src/plugins/gstreamer/camerabin/camerabinsession.cpp | |
parent | 1024c8684bbe947cac122e68d0fc3594ff81fa4f (diff) | |
parent | 306e8511602ac3c23778d6aef994269d17d3145c (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I2148d0d01e52ad33fb13895e7f72dc2b7ff23486
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinsession.cpp')
0 files changed, 0 insertions, 0 deletions