diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-09 22:14:43 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-09 22:14:43 +0100 |
commit | 43564140cb702994971f7c5fff3227f700c32995 (patch) | |
tree | 4d378d1aaf4c723c817426b67f0c414ad64fa03e /.qmake.conf | |
parent | cdb0a5dddf84e27dda294cecebd64c282227f162 (diff) | |
parent | 2c15783c02e3abfc3c528d270c448d1d555c8036 (diff) |
Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: Ib7e7fc1cbe344cd4fe66a3a2be0d591c22509b47
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions