summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-21 14:07:10 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-06-21 14:07:10 +0000
commitb3100fbadda33fe013e3f1fba3623a63a6dccf47 (patch)
tree0fdd96d90d9c754959e532dfc42988167697eb68 /configure.pri
parent62b11af31ee090188d828707235d8678ee015e30 (diff)
parentea438b2508f329698e11c6dae6994d441c6e67df (diff)
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'configure.pri')
0 files changed, 0 insertions, 0 deletions