diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:33:11 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:33:16 +0200 |
commit | 7e9f4028c5ac856d9a307927528fd4065f8b4ff8 (patch) | |
tree | 87539f0467ac06174008e7eacaf2ba824b68351e /.qmake.conf | |
parent | 514f8a63d8e4b915bb8c51248ca811306f267286 (diff) | |
parent | a0303dc75cbd2132d1411a04cf9bc1da03b30e90 (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions