diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:33:27 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:33:27 +0100 |
| commit | e2fe789f1055835c92ece16646edff892e0f4d9c (patch) | |
| tree | 3879bec73cdc7a756f2f117292c692ad319d6b40 | |
| parent | 626649e5675adbc4db689bcf9b93cd65ffc1ba29 (diff) | |
| parent | 8fe3f8873210bfe8ca584eb30d88ac19e355957d (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: Ib2efe0c8577539d292742af117d0d36fffd38ad6
0 files changed, 0 insertions, 0 deletions