diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 13:24:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 13:24:43 +0200 |
| commit | f56f2c20c4da182f6a979c418f7ba93d8d71694b (patch) | |
| tree | 8b79e348c7b158fece50d3cf9f9e893532fdf996 /coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 | |
| parent | 8b9a8c489f8670a3be7cf30d2cfc224fb95c1144 (diff) | |
| parent | c9d5341307e02cc71d4d99342e6915621f7d18f3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
coin/platform_configs/default.txt
This also reverts c9d5341307e02cc71d4d99342e6915621f7d18f3 as on macOS
10.11 in 5.9 we're using a fresh virtual machine template that doesn't
have stale virtualenv/python installations.
Change-Id: Iab50fde0388c97967ada7c40374345ce4327613a
Diffstat (limited to 'coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" |