diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:10:23 +0200 |
commit | ff8220f9f67ce7aa166a083d50d937578ab6a9db (patch) | |
tree | 320f7b362b0f59c382546fc98172cc61c811ce95 /coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 | |
parent | 38b6cbfd4261433548674aa4d109fff8a007c636 (diff) | |
parent | 577d01e9dfaa9e69608097c550bd1877b5a9b735 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
.gitmodules
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/platform_configs/qtbase.txt
Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1')
-rw-r--r-- | coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 new file mode 100644 index 00000000..0e2abbac --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + |