summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-30 03:06:43 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-30 03:06:43 +0100
commitbde68094dd387503f904f1131a5da888500667e7 (patch)
tree2a2b7cdc8a013eec1411fa290d9c621c27249b87 /.qmake.conf
parentf5e182f271daa24d743f266b219f0f21f4003726 (diff)
parent4c155d94a294ace4a402f135272f04bcd73f4732 (diff)
downloadqtxmlpatterns-bde68094dd387503f904f1131a5da888500667e7.tar.gz
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I76d2acc6e6189b94b951e28d3ceff93817a3bc1c
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions