diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:53:08 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 14:06:05 +0100 |
| commit | a434f14bd93f387f5f981fcd7d27ce95384d1ce6 (patch) | |
| tree | b5cc79dd41ef6dd3c49dafcf899d469574632123 /qt3d | |
| parent | 282899453d2c6b4c51bbd94fc228f2bb711d64f6 (diff) | |
| parent | 351a519340d509300c754d0a62771a7f6e38ea4c (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
coin/provisioning/common/linux/qnx_700.sh
coin/provisioning/common/windows/libclang.ps1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
Diffstat (limited to 'qt3d')
0 files changed, 0 insertions, 0 deletions