diff options
author | Liang Qi <liang.qi@qt.io> | 2019-06-25 10:29:08 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-06-25 10:29:08 +0200 |
commit | 34a13ff5d9660a4c3dce00da61a28568efda7e73 (patch) | |
tree | ff5f1df278a3f0f19096fb187bf56f5834397530 /coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 | |
parent | 4048c76e6564bb14c9cb84a1751cb94eb451ae45 (diff) | |
parent | 6e350aff34545e7b41b07617c9152f81db735702 (diff) |
Merge remote-tracking branch 'origin/5.12.4' into 5.12
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I1381c4b80a64859cb42d6cb5205ef549de40dde6
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 new file mode 100644 index 00000000..b3c8fded --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-sed.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sed.ps1" |