summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-06-11 12:57:07 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-06-11 12:57:42 +0200
commit4a488678219267cde4694ae3f3f7dbf390be4140 (patch)
treeb47c0939bc7dfa155b787448da5102a10a156cfe /configure.pri
parent7f89badd0e1b71dabb5a88d1330b08ce9d8b6eb7 (diff)
parent147d70f330648acd105d6eb62493366fcf1e3abd (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'configure.pri')
0 files changed, 0 insertions, 0 deletions