diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:31:52 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:31:52 +0100 |
| commit | 20f436e045bc4636af6acecfa11478f926d4be42 (patch) | |
| tree | 48dc55ef15ef88cac1a34fd00d88d5a659e8719a | |
| parent | 55a29189045dd0e4303d9cb1447c335620a37218 (diff) | |
| parent | aca14b548477a00028a99d8acf184ec5c6403d95 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I5dd7cf122561e2f518800227654b0647de8b992e
0 files changed, 0 insertions, 0 deletions