diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-02 10:35:50 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-02 10:35:50 +0100 |
| commit | e61c7485d7dc4c1d40a8f6f254568ad5278544e4 (patch) | |
| tree | dd7ae312b92e969bdd39bd893d65b91a1fb43d80 | |
| parent | 690fb774ce2c78ff456f85a07c0ebcf3468b8515 (diff) | |
| parent | 0c5493b7e31f96277851667a9c0c04f0d7c9d750 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I1866b46dfde5c94ceff1fed8c41573a45852de27
0 files changed, 0 insertions, 0 deletions