diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:01:16 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:13:00 +0200 |
| commit | 88dbeac656030b92133d90fc8bc0e5c72c38cd8a (patch) | |
| tree | f243d5584b276adaebd233610c796c7fe81f9e20 | |
| parent | 1efe161af9f43c07abf447f60df7eca3e541e768 (diff) | |
| parent | 62a802cbccc18330b010d7197a739d35ba9ae3c7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I86258ec0351ed2d13c22a80756bdd694a5b0327c
0 files changed, 0 insertions, 0 deletions