diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-09 23:09:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-09 23:09:15 +0100 |
| commit | c2c45640e0bc40fb9ac3a8175325a76de2c0b496 (patch) | |
| tree | 0151a5637dcb7330ece51c3c744f216e117a875d /coin/provisioning/qtci-windows-8-x86 | |
| parent | a0e1f4f480149c4a3cac0294c6c7cab2ad0ab76e (diff) | |
| parent | 828f82b6f00946c194b6909559bdce0b40d0f9a8 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/platform_configs/qt5.txt
coin/provisioning/common/install-commandlinetools.sh
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh
Change-Id: I3b20cda2b35412fd708295e4f9e32cd2d7d638fb
Diffstat (limited to 'coin/provisioning/qtci-windows-8-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 deleted file mode 100644 index 1042c846..00000000 --- a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" |