summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-27 09:27:28 (GMT)
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-27 09:27:28 (GMT)
commitc886d992029740da0185fd2bf8a040c84156e73d (patch)
treeddcbb29fc39cb9f1f235c7bb7275693f5695c818
parentea54a86408c73340cdbfc5360209d3a01cc324c2 (diff)
parent595e7cf516be4667b41ed358eabafcbf2f23ef5c (diff)
downloadqtxmlpatterns-c886d992029740da0185fd2bf8a040c84156e73d.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2
Conflicts: .qmake.conf Change-Id: Iff5664d0a21b3c7216d5fbc18524e7623e31ebb0
0 files changed, 0 insertions, 0 deletions