summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-05 13:32:15 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-05 13:32:15 +0100
commit5b5da71586c8391fd74415ec9241c13489445b2a (patch)
treeaebe3b95f7edd823e7dc38f54aae08e9c1bdf87d
parentccde017309249a01e67cae0f2b89b3ae4285ca4d (diff)
parent95b629b30380be3de92158ad55ba266452d3c945 (diff)
downloadqtxmlpatterns-5b5da71586c8391fd74415ec9241c13489445b2a.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts: .qmake.conf Change-Id: I12424435f2a4c4f2b582c7acad18e0c57dfbd554
0 files changed, 0 insertions, 0 deletions