From ca912f8b7000268da4ae37d68eda3b9b513d63ef Mon Sep 17 00:00:00 2001
From: Steven Santos Erenst <stevenerenst@gmail.com>
Date: Tue, 28 Aug 2018 21:03:19 -0700
Subject: Fix broken FAQ link in primer.md

The current link pointed to a non existing section in the FAQ.
---
 googletest/docs/primer.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/googletest/docs/primer.md b/googletest/docs/primer.md
index 02dea42..7a8ea8d 100644
--- a/googletest/docs/primer.md
+++ b/googletest/docs/primer.md
@@ -317,7 +317,7 @@ To create a fixture:
 1.  If necessary, write a destructor or `TearDown()` function to release any
     resources you allocated in `SetUp()` . To learn when you should use the
     constructor/destructor and when you should use `SetUp()/TearDown()`, read
-    this [FAQ](faq.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function) entry.
+    this [FAQ](faq.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-setupteardown) entry.
 1.  If needed, define subroutines for your tests to share.
 
 When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to
-- 
cgit v0.12


From fab22526469a1a87ca248e54fe371cbfbf009cd4 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Wed, 29 Aug 2018 21:58:47 -0400
Subject: Changing clang tp 3.9 as 3.7 no longer works on Travis

---
 ci/env-linux.sh     | 2 +-
 ci/env-osx.sh       | 2 +-
 ci/install-linux.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/env-linux.sh b/ci/env-linux.sh
index 9086b1f..37800d6 100755
--- a/ci/env-linux.sh
+++ b/ci/env-linux.sh
@@ -37,5 +37,5 @@
 
 if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
     if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
-    if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+    if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
 fi
diff --git a/ci/env-osx.sh b/ci/env-osx.sh
index 31c8835..127a969 100755
--- a/ci/env-osx.sh
+++ b/ci/env-osx.sh
@@ -36,5 +36,5 @@
 # TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
 
 if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-    if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+    if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
 fi
diff --git a/ci/install-linux.sh b/ci/install-linux.sh
index 02a1943..05e2cb2 100755
--- a/ci/install-linux.sh
+++ b/ci/install-linux.sh
@@ -41,7 +41,7 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then
     echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | \
         sudo tee /etc/apt/sources.list.d/bazel.list
     curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
-    sudo apt-get update && sudo apt-get install -y bazel gcc-4.9 g++-4.9 clang-3.7
+    sudo apt-get update && sudo apt-get install -y bazel gcc-4.9 g++-4.9 clang-3.9
 elif [ "${CXX}" = "clang++" ]; then
     # Use ccache, assuming $HOME/bin is in the path, which is true in the Travis build environment.
     ln -sf /usr/bin/ccache $HOME/bin/${CXX};
-- 
cgit v0.12


From 3dbba3b072b1e67c5dc6793741da4b5408f8a552 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Wed, 29 Aug 2018 22:02:08 -0400
Subject: Changing clang tp 3.9 as 3.7 no longer works on Travis

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0e17bc2..4e7413a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,10 +72,10 @@ addons:
     #   https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
     sources:
     - ubuntu-toolchain-r-test
-    - llvm-toolchain-precise-3.7
+    - llvm-toolchain-precise-3.9
     packages:
     - g++-4.9
-    - clang-3.7
+    - clang-3.9
 
 notifications:
   email: false
-- 
cgit v0.12