diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-04 13:33:34 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-04 13:33:34 +0200 |
| commit | 33e84ef3dbee71ca8d550affd58aac81b7c57dda (patch) | |
| tree | cf3dc16371a4f29a75b3b3325722f71b1629202c | |
| parent | 69d5809f4ec66ec293c3a5dfb60d63b0fb757402 (diff) | |
| parent | c3f764b524b959eac506d210f30554d12c1ce9ca (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I2f23fb7f07e6cde283c92366aeedd62e2266113d
0 files changed, 0 insertions, 0 deletions