diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-05-28 10:22:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-05-28 10:22:03 +0200 |
| commit | c1c44574f658ab7e9c0ce9e59404f1b2dc97542c (patch) | |
| tree | 8bcbe9a51e2ef06a559f24f26a9d6c56956e0ed2 /qt3d | |
| parent | 9a4fc7074c72b1c7bb8bf2dd2f3886aa87d04530 (diff) | |
| parent | 717364e3e10f39f602545c080f34baa064760b7a (diff) | |
Merge remote-tracking branch 'origin/5.15.0' into 5.15
Conflicts:
coin/provisioning/common/linux/qnx_700.sh
coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh
coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh
coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
Change-Id: Ic7ed52251573824595821c53025323287d60b536
Diffstat (limited to 'qt3d')
0 files changed, 0 insertions, 0 deletions