summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-25 03:02:28 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-25 03:02:29 +0100
commit6fc28d438aaac9723a8b40b87b6d77d6841d6dce (patch)
tree15cc698011bc500ffe35b0d13663dd4c3ae2f54c /.qmake.conf
parent42cd1f32411d1e5008812036803bfadba30fde08 (diff)
parent274f162fd41c4de88df7efda9e6ec16a1ca968bc (diff)
downloadqtxmlpatterns-6fc28d438aaac9723a8b40b87b6d77d6841d6dce.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I3127c314d2aa4a9b40cbdcd480d5c2a37919f2d0
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions