diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:27:31 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:27:31 +0100 |
| commit | 49d744be877b2a4cba3e306c4ab0056687179318 (patch) | |
| tree | 525ebcbe6908f2886502995eca83c89b3555b8f4 | |
| parent | fe4c2bf06610da5bb27e63dcd784e11724b06773 (diff) | |
| parent | 4e5f9b48b1d828bd15c32cd98d9878b0ed892dd9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: Ia0585cba89bf08b3a12413f49fd65d5a63c2c34a
0 files changed, 0 insertions, 0 deletions