diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-07 03:00:07 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-07 03:00:07 +0100 |
commit | 379d45c71fd5d0e145a5e6e329f0bc60acfb05a7 (patch) | |
tree | a602f0948cdae92a01717a62d97ee9507c086c73 /.qmake.conf | |
parent | 75c1c58de7c235056e687945de71463cbb295089 (diff) | |
parent | f6b550ea5eae80124576766fe1a9609ae5aba1e3 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I1551d1e2d9b720bb0f28fb0d056a8492699afee5
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions