diff options
author | Liang Qi <liang.qi@qt.io> | 2020-04-24 15:31:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-04-24 15:31:01 +0200 |
commit | cc4fdea014287bb2c2b7dfe55104c2d620026da5 (patch) | |
tree | fd04d83477596ad43e514cd3f8f1cfbb477d0aea /coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 | |
parent | 285f2c5690290e49313ccf8b76402c30acabbb5e (diff) | |
parent | ac8b28db576356431a1a414b2c08b2eb09c8b898 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.gitmodules
coin/platform_configs/qt5.yaml
coin/platform_configs/qtsdk.yaml
coin/platform_configs/tqtc-qt-rta.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 deleted file mode 100644 index ee3b3b7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-ntp.ps1" |