diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:35:12 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:35:13 +0100 |
| commit | 8152dd60c072e6ff9c48e64bbdaad01dfc2915f1 (patch) | |
| tree | 6d76c42d511769b883515e75dc01ceda00c56387 | |
| parent | 2ef5c50448cb9ee52d2f678a44286b058b3104c2 (diff) | |
| parent | 4ec76380e83b86a9202c4b24a1dc3452eedd937b (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I83341746e2aeeab57a9b1196d5169aadb155f0ce
0 files changed, 0 insertions, 0 deletions