diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:05:10 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:36:26 +0200 |
| commit | 9ed06b9272312c77f19bcdd7888eee19f7f99c95 (patch) | |
| tree | 76c07405670ca773c3d8cf529d98f56fc7018a7f | |
| parent | 7efc576d06b277561eed5ad7d77742feb948ed32 (diff) | |
| parent | 5d1f57556b7d4892ee88e4109d3920a4c64ae9d9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I21c07f00492e8f41860b870bdec48ddceeb1c9fd
0 files changed, 0 insertions, 0 deletions