summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-05 13:31:43 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-05 13:31:43 +0100
commit067f188d321fb65c8291654ee692ea813ef2fc18 (patch)
tree473bc5679c76f6fad5f887aeb942e461597c1b24
parentd57644c5b5abae34252cc674abde22f330a162c8 (diff)
parent9beac3cc9bcb1806ad1f8118a70467c122b9e938 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts: .qmake.conf Change-Id: I00344b079aeeeac0528f1206ec22a206e482015b
0 files changed, 0 insertions, 0 deletions