diff options
author | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-11-06 14:19:45 +0100 |
commit | 68189ab965784b5f83729e08de5f54965dc7cd32 (patch) | |
tree | 5a9bfe72da0ee5b1ae5abca6c4854503efc06840 /coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | |
parent | 98cb5fa96506837f417d6c2cfdb9c6abe3223d52 (diff) | |
parent | d690f84fd40beebcb9891df8bb656973daf55b22 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh
Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh deleted file mode 100755 index 74520b6e..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -set -ex - -"$(dirname "$0")/../common/linux/cmake_linux.sh" |