diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:29:40 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-08 11:29:45 +0200 |
commit | 1a58c3cffe2190f20aca3d7acbb25a9ff62d6770 (patch) | |
tree | 3dd783a72a01b21e3bf1fe018ae675fba102185c /.qmake.conf | |
parent | cd09330ce6304359ded5217ae28d2617144c36a5 (diff) | |
parent | 6b8b6743d30fc18f90f57a5b957bc80d8fb5fd67 (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions