summaryrefslogtreecommitdiffstats
path: root/src/plugins/gstreamer/camerabin/camerabinsession.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-10 03:00:22 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-03-10 03:00:22 +0100
commit2845e10810a50d6cba4f19a27cfefac10b06929a (patch)
tree401c55c67916af7b6c1e8b22ba0a8eb19667ece9 /src/plugins/gstreamer/camerabin/camerabinsession.cpp
parent1024c8684bbe947cac122e68d0fc3594ff81fa4f (diff)
parent306e8511602ac3c23778d6aef994269d17d3145c (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinsession.cpp')
0 files changed, 0 insertions, 0 deletions