summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-07 13:12:32 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-07 13:12:38 +0200
commit647a9f29035add2b50ac510f0ddc06cb34122435 (patch)
treeefbae29f7e40d1a2ae4f10888f3371605da36fdf /.qmake.conf
parent3480921b44f7a4dc8a38656a9722c1507a1b840a (diff)
parente5fe1b1b920644eb93e9e4eb6837e6c9a935f570 (diff)
Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions