diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:00:02 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:05:35 +0200 |
commit | 8d5619bea37d5d2a2d2591ab9ec02fe2a53607ff (patch) | |
tree | 38cfa244eba3fbabc2a8459f3941d25cb079afc8 | |
parent | b68d01c6c58c96823654fa527a4a3feadea67694 (diff) | |
parent | 656f3c134c0cf00743deba3dfaaff7cb5bd17906 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I405fc51470e5505a44e160ca030402655a518dc4
0 files changed, 0 insertions, 0 deletions