diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:28 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:28 +0100 |
| commit | fd7256fa62c1862d7924a3d8855bde21ac7475ed (patch) | |
| tree | 13bd46e0a91e2fd8badfee79d65fcecc6a134331 | |
| parent | 0f3ff1823c4bf1fc12280a677b871f381c77d0fb (diff) | |
| parent | 7a0956a89a559e5a73a659fcc08001cefa01d9bd (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ic6c2ec0c4d0a0d4e0c94857020d3804ce9cf9ff6
0 files changed, 0 insertions, 0 deletions