diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:58 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:58 +0100 |
| commit | cf5741a44a6c337fa523080838d8e9220f4370c1 (patch) | |
| tree | 71774fccb0b6f3007b0dcaa5418efb9ad2ddf49f | |
| parent | e3a77155253d40133476212713094c3bc897a938 (diff) | |
| parent | 88fa9ac94241a182f8ad92a692eccabbc0caa9cc (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I5553a72b4463dcbd89ba66e7962baf1cd8d84b33
0 files changed, 0 insertions, 0 deletions