diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:10:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:10:46 +0100 |
| commit | ca8a2e1d7e96e92408625805cf311dcc380f161e (patch) | |
| tree | a7f3c2d16d50540a25e2a899ce33316e43beb68c | |
| parent | e3c06beffd3ccf59c5266dd2c9620c499561e26f (diff) | |
| parent | 95304102ce905cf3661f5669428bc4e5b9a418a4 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: Ibfabe0671596bf6ba3ef5fe8bcfbcc1e02cbf1ab
0 files changed, 0 insertions, 0 deletions