diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-12 21:36:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-12 21:36:03 +0200 |
| commit | 20113e48724e303e40f6930d44b0999e965ea67a (patch) | |
| tree | 7499419f896dd1504fff531a1bee3a18dc289bfc /coin/provisioning/qtci-windows-8-x86 | |
| parent | 9b0e908aca19d58a0d6b6eefebeb7e184437ada5 (diff) | |
| parent | 5bc43f0cc3cfe047dcdbe2a293f4ed6885d8a637 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
Diffstat (limited to 'coin/provisioning/qtci-windows-8-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 index 3bb0af0e..dfca166f 100644 --- a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 +++ b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" +. "$PSScriptRoot\..\common\windows_removethemall.ps1" |