diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:36:26 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:36:26 +0100 |
| commit | 01d0cb221231adfbddb5cb5c4f3ea6e016bbb3bb (patch) | |
| tree | 4b7adeda03d0dbfa4f9c8a0eae499ea86ba5be2e | |
| parent | 4763dbf72243754447bc9fea3534eeea73de2975 (diff) | |
| parent | cef398f8c2176294dc492d7257c2b3705ec5a6ea (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I489fc7bccc0db526e8722fff8cce38c74676db91
0 files changed, 0 insertions, 0 deletions