summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-09 03:01:51 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2019-07-11 14:15:24 +0200
commitdbb9732bc7c9e1301cca32bb5a489b928c65d007 (patch)
treef07466a6d07f5d1be84098745ce570df3b442a71 /dist
parent89edc161514a75b353b9efedb0a3628b62978e6e (diff)
parenta50f613a37acf32886ab94c0be780c1f25493d52 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts: .qmake.conf Change-Id: I3ce52129ba65049a46afcc4fb2b9c8800dbff441
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions