diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:05:33 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:05:34 +0200 |
commit | 4d8d306e3e555da92296cb8ca1b62fcfad0f5268 (patch) | |
tree | 1d2059c5dfda77d15df6635c7f39d5d334c48756 /.qmake.conf | |
parent | 3f072805e86ef2fb3d502ab42394234c24fb0a82 (diff) | |
parent | bf062048c3d1622fc1a671678fb930c738b18e8d (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If61ddacceb027f64f8412540670b95fbade546a1
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions