diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-24 09:12:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-24 09:12:33 +0200 |
| commit | ebf8aa15e67caacab514ea93782ff0783d60af2d (patch) | |
| tree | ecbaf2c3669d1de878ead56e8b44a83bff65efdc /coin/provisioning/qtci-windows-8-x86 | |
| parent | d18d7aaa40cfd92279bec558e980ff6c58c49340 (diff) | |
| parent | dfaabde5dcbdecf24d24dce4172c976687085bb6 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
coin/provisioning/common/system_updates.sh
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
Diffstat (limited to 'coin/provisioning/qtci-windows-8-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-8-x86/libusb.ps1 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-windows-8-x86/libusb.ps1 b/coin/provisioning/qtci-windows-8-x86/libusb.ps1 deleted file mode 100644 index a853ffef..00000000 --- a/coin/provisioning/qtci-windows-8-x86/libusb.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\libusb.ps1" |