diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:04:20 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:28:46 +0200 |
| commit | b24e07cbcbf7d7846baaaab77d632a2422128ada (patch) | |
| tree | 59b58db2a2450a696d5419b4f8f47112a40a80d3 /dist/changes-5.3.0 | |
| parent | 493697bf951d8baa40203027baa0528f4d27cdca (diff) | |
| parent | 9509b6d3ee02c3c4a0b98dc95bc9787a3c514a18 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I5ce880f305ebb0af7f7803769cecf2c899bede12
Diffstat (limited to 'dist/changes-5.3.0')
0 files changed, 0 insertions, 0 deletions