summaryrefslogtreecommitdiffstats
path: root/src/multimedia/doc/snippets/multimedia-snippets/multimedia-snippets.pro
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-13 03:01:49 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-13 03:01:56 +0200
commit7b1bb300166aa19dc0f4c6838eb6d284af73236c (patch)
treef5586f079726cf909b48bd9e55fa1b5e18381801 /src/multimedia/doc/snippets/multimedia-snippets/multimedia-snippets.pro
parent2da4e162516830f4976f30c789a3fd9511dde932 (diff)
parent97213e13cd7f2ccae1d5215bbb503f8f59c0ad22 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/multimedia/doc/snippets/multimedia-snippets/multimedia-snippets.pro')
0 files changed, 0 insertions, 0 deletions