diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 13:11:45 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 13:11:52 +0200 |
commit | 594e2b7d381858ae2dc70743824b9bf14b594599 (patch) | |
tree | 741b82ebb20943a3cc605861944d98e54c82b245 /.qmake.conf | |
parent | d5d0cd81cc770d696b19305717cc827ec1a89bd4 (diff) | |
parent | 2f4675eefe53e8cd9465665bcb9cf258ec5d99a9 (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