aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorGravatar George Nachman <georgen@google.com>2014-07-24 12:04:10 -0700
committerGravatar George Nachman <georgen@google.com>2014-07-24 12:04:10 -0700
commit108bb69dab1a0e6fcc17115c0e94feadaf820216 (patch)
tree26ac82f97fb499ae8624047b2643f11b6bbde0dd /scripts
parent1f243bb124f03e2b8710dc70f31010ab42cdf964 (diff)
parentdfc73dd7ad39d13e2cb06b2a308dbab38105c786 (diff)
Merge branch 'master' of https://github.com/MailCore/mailcore2 into iOS8AndLibCpp
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/prepare-libetpan-ios.sh2
-rwxr-xr-xscripts/prepare-libetpan-macos.sh2
-rwxr-xr-xscripts/travis/before-script.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/prepare-libetpan-ios.sh b/scripts/prepare-libetpan-ios.sh
index 031e33e1..180e3721 100755
--- a/scripts/prepare-libetpan-ios.sh
+++ b/scripts/prepare-libetpan-ios.sh
@@ -18,7 +18,7 @@ else
fi
url="https://github.com/dinhviethoa/libetpan.git"
-rev=8f5362931453920803a270c6d35ab82f69a02525
+rev=01b3b3b83d2b8651c0279018d4e48061509494eb
pushd `dirname $0` > /dev/null
scriptpath=`pwd`
diff --git a/scripts/prepare-libetpan-macos.sh b/scripts/prepare-libetpan-macos.sh
index dc46e9d5..37405416 100755
--- a/scripts/prepare-libetpan-macos.sh
+++ b/scripts/prepare-libetpan-macos.sh
@@ -1,7 +1,7 @@
#!/bin/sh
url="https://github.com/dinhviethoa/libetpan.git"
-rev=8f5362931453920803a270c6d35ab82f69a02525
+rev=01b3b3b83d2b8651c0279018d4e48061509494eb
pushd `dirname $0` > /dev/null
scriptpath=`pwd`
diff --git a/scripts/travis/before-script.sh b/scripts/travis/before-script.sh
index 99966882..b6ba2464 100755
--- a/scripts/travis/before-script.sh
+++ b/scripts/travis/before-script.sh
@@ -3,7 +3,7 @@ set -e
if test x"`uname`" = xDarwin ; then
brew update
- brew install cmake
+# brew install cmake
elif test x"`uname`" = xLinux ; then
git clone --depth=1 https://github.com/dinhviethoa/libetpan
cd libetpan