summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-29 01:00:33 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-29 01:00:46 +0200
commitf2a10ea09496bfbb181f9aff6bb67c1f1183fce3 (patch)
tree28bcb842a92c69a3244a969948dd0425f92cbe44 /src/corelib
parentdf7c97f8eed00a1dcd24a815d89d2842f7d6d116 (diff)
parent134ee9d548c1289f8bb4c7fb5302db37a9437dfe (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions