summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/customvideosurface/customvideowidget
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-06 03:01:34 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-06 03:01:41 +0200
commit5e35587975d6917c9d60ee06c40211af98020105 (patch)
treee385366e30e7fa2c731a8bcdb470b870cb26347d /examples/multimediawidgets/customvideosurface/customvideowidget
parentd89a4269ce1d9729842a508d97e1f1aeaf7305ee (diff)
parentf03cfbc816b63086c0427e5026af3eed8037b836 (diff)
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'examples/multimediawidgets/customvideosurface/customvideowidget')
0 files changed, 0 insertions, 0 deletions