summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 21:06:31 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 21:06:32 +0200
commitbb04cf3071975c748fb6d34f64e7151d8ea8417d (patch)
treed042c29705bccd505f85b373cae1988176f033f6 /src
parent6ba3ad4b51ec082597ec87a63505c4ab18fb800f (diff)
parentbe24a7a43cfe4db4c9a9d95f9321c8abec3b0ae7 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions