diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:21 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:21 +0100 |
| commit | 957cc79d4b5c36aa6b8dc99f73bd0b04b62d6898 (patch) | |
| tree | 9a034a4f3f7f83f1c0b2eca7b588a49bd7fc1ac5 | |
| parent | 822050cadf4f67f72e3b0ef108b547e8a85d6028 (diff) | |
| parent | 0a0911079d25b529b102fb2c4ba2de2cb45b9e5d (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I9620dd3bdd123031a44b76e4b0831f9e8f4e8925
0 files changed, 0 insertions, 0 deletions