diff options
author | Liang Qi <liang.qi@qt.io> | 2018-07-02 13:12:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-07-02 13:12:35 +0200 |
commit | c6d9e433dfa899890b4279c773779659f8cb2626 (patch) | |
tree | 1335a5742b5c6eed239f26e616fdad30e1af6271 /coin/provisioning/qtci-windows-7-x86 | |
parent | 7784f89036afca51292ab0cc3aadff59b3004f5f (diff) | |
parent | 3e044c71b92617eb8eb794edd30d94f57d9524ac (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
Change-Id: I00d0ccd138eb8d89e30e7e57632c6fc8f83e0001
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86')
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 deleted file mode 100644 index 375deed3..00000000 --- a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw |