summaryrefslogtreecommitdiffstats
path: root/src/qtmultimediaquicktools
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-28 07:37:46 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-28 07:37:53 +0200
commit03188b88025a849e15125eecb21395fa7f9a0158 (patch)
treed03e25c1ae809ec25aea65ea9e9ab3227044bee1 /src/qtmultimediaquicktools
parentd4a3e85eb86d551bdbeae973ab59c1fcee09393e (diff)
parent013bd42385bf04ffd83e4409eef42bde8c1a4529 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/qtmultimediaquicktools')
0 files changed, 0 insertions, 0 deletions