summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-07-29 01:00:11 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2019-07-29 15:33:37 +0200
commitf53fc76060e4eb5eeec28318946db9cc2bcfaca6 (patch)
tree9ddf902929831657cc59ab537de10a119d190e9d /configure.pri
parentc8bb8cb7614768156f9cc4bccc2df928d5430067 (diff)
parent154155f588c89d43362abb58bcf91449c78e3ff8 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'configure.pri')
0 files changed, 0 insertions, 0 deletions