diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 11:55:33 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 11:55:33 +0100 |
commit | 4a1dda32bdfc907495eab564b8d4af4775505439 (patch) | |
tree | 25b8b85dc518a1114a219cc75b4aba4c28bc4c1a /.qmake.conf | |
parent | 2ef9a6277a9ea160060d24c67cebcde6feefc1f5 (diff) | |
parent | 09ed2f46fb51ec508bd1c5836d2a1884246e9d09 (diff) |
Merge remote-tracking branch 'origin/5.12.6' into 5.12
Change-Id: Ied8f5c30564732b1315774c7662d7c71bdaa9ff9
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions