diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:31:12 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:31:13 +0100 |
| commit | 38610dd856ee2969e82d23cb28b68576023e3b07 (patch) | |
| tree | faa346e632c14367ab8f060af19bce1f2bf67529 | |
| parent | 450f2b3dd32e6b8374f404dbc2968f31bcbc3be7 (diff) | |
| parent | 4b3201059dfc2fc5038910c51eb8ca9d75e98765 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I74fc1506a8698b3feeeb0aad578ea3b40ed3e935
0 files changed, 0 insertions, 0 deletions