diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 11:08:40 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 11:08:40 +0100 |
commit | 45bae08122145a770601b3898d86532b9261b670 (patch) | |
tree | 407d2ec6ee223c8c9e3af50a024f78285cd58110 /.qmake.conf | |
parent | f2dc1d1a2df6bc728c0f65b4e4c59025d6057510 (diff) | |
parent | 23dd4484915e3de89a093f8525afed1c5b8294eb (diff) |
Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: Iaec14f1a6c952e0951efee2e6c42f49072b2835f
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions