diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:32:48 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:32:48 +0100 |
| commit | f63d2a7b46f6639b1606448bc964313b76b2099c (patch) | |
| tree | 7a324fcef74bdef093fe8557550a991c7f01ec5d | |
| parent | d11b8ba3ddcc91dc2a6797b22f6d125b571701a2 (diff) | |
| parent | 9d1491a38e927893340bde238ffcefe970abd9f9 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I44732bf042db9437150bc58a5702a607a0a8226d
0 files changed, 0 insertions, 0 deletions