diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:33:00 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:33:00 +0100 |
| commit | 620eeaaa5bf3af1b5c1760042d1c369d21ad2a8f (patch) | |
| tree | 68919a52b434db51d48a0258cce85385f6cc1e40 | |
| parent | b0b223aace8b07f0ee53d2156ee232fd57404603 (diff) | |
| parent | 86efcb0bea7a9df8aa8be2c836e1a2f7da25fd3a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: If5cf8cef472f062899993c6bd69018df1953c5bb
0 files changed, 0 insertions, 0 deletions