diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-05 11:22:54 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-05 11:22:54 +0200 |
| commit | 8d2f6c17f9c1baca42c115ce85ea1a6cb90a0517 (patch) | |
| tree | 1c858055a5f795da4ac9d11bdde26f456c147788 /coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 | |
| parent | 8325f2bde99910c26077ab4321046f42489261bb (diff) | |
| parent | 4f4de8aa1614cc6fc8d924c13509de869b4471fe (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.9.0
Conflicts:
.gitmodules
Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 new file mode 100644 index 00000000..3bc58072 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\3dstudio_3rdparty.ps1" |