diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:35:04 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:35:04 +0100 |
| commit | 8136ffdfe8ec8fe1b005fc5e72d66e0fd160b583 (patch) | |
| tree | 665ba968f8346dddabd18ba3a3903199f9278aa8 | |
| parent | a6b0fba79793447a8a21009bda3c8ef4a19a80cc (diff) | |
| parent | 57910a8015e05328a9ad412b4d76cc2137a853f3 (diff) | |
| download | qtx11extras-8136ffdfe8ec8fe1b005fc5e72d66e0fd160b583.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I7200e8acab3b84235ab0c4f6fe93692682add968
0 files changed, 0 insertions, 0 deletions