summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-11 03:01:56 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-11 03:01:56 +0200
commitbab8ca799f3a54c10f92958f2db1ce482adfc08c (patch)
treea76099169b452b912c2a450d83dc6e3eceaa79f5 /.qmake.conf
parentc1766c64f9f76c075aa1f1723f193bcbfd5e79b2 (diff)
parent574098ec0d928d8eb02cf997318c0168952297e9 (diff)
downloadqtserialport-bab8ca799f3a54c10f92958f2db1ce482adfc08c.tar.gz
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I3d5718006e8fee8fa3c2f97aec03183a4db1aa7c
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions