summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-08 11:32:39 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-08 11:32:45 +0200
commitac9f2e582dc6c0f740b8c5b225bc65a8c1b35e9e (patch)
tree3eff607c9b316a5addb3d22fa3a2dbbc6d42d52b /src
parent0f7ad49951419199d7042bdf91649a50e309059a (diff)
parenta27e80f4ed0a529ae0260e199f0bc4a1894e81ed (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions