diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:37:06 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:37:06 +0100 |
| commit | de3b06752276e33c80d6a897f57f22f658bd5e0c (patch) | |
| tree | c3da8e9d5ee167b4ea30329819f8a5719a4daaab | |
| parent | b77ec222d88b5d9a579c8cbca3298e07cc08e265 (diff) | |
| parent | 5e31c8a64073a3d2d88c23f211f22e719ffcd8a0 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I04fa78ff07aafdaf7a0718bca10242413a9a9ec9
0 files changed, 0 insertions, 0 deletions