diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:07:46 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 11:40:06 +0200 |
| commit | 6ffdfe0cfffa3ae8f09af13ecb4cb0930e23a82d (patch) | |
| tree | 3e9d844b87eda4c723519aecad7206ffe546db39 | |
| parent | 7ad0ef0f31afd89509dc2cb3c102b22c0e6c725c (diff) | |
| parent | 7bdf0823b64e53a90f7a54151afada3aaceb7ba1 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Idf9f3c89095eb042ce5acf6c2b03fec6b7bbde70
0 files changed, 0 insertions, 0 deletions