From 68f19facc26aba2e1d3e73978b7daf9b0bfa3970 Mon Sep 17 00:00:00 2001
From: Claus Stovgaard <claus.stovgaard@gmail.com>
Date: Tue, 30 Aug 2016 16:15:46 +0200
Subject: Moved the ignoring of *.pyc files to top level for also covering
 googlemock python scripts.

---
 .gitignore            | 2 ++
 googletest/.gitignore | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 googletest/.gitignore

diff --git a/.gitignore b/.gitignore
index ce310bc3..1da12d1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 # Ignore CI build directory
 build/
+# python
+*.pyc
diff --git a/googletest/.gitignore b/googletest/.gitignore
deleted file mode 100644
index 4b7be4b9..00000000
--- a/googletest/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# python
-*.pyc
-- 
cgit v1.2.3


From 8364718500dac72c141aa55dcb2483177356717d Mon Sep 17 00:00:00 2001
From: Herbert Thielen <thielen@hs-worms.de>
Date: Tue, 29 Aug 2017 16:35:41 +0200
Subject: remove non-existing gmock_build_samples switch

---
 travis.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/travis.sh b/travis.sh
index bdecbd96..cb36e989 100755
--- a/travis.sh
+++ b/travis.sh
@@ -6,7 +6,6 @@ mkdir build || true
 mkdir build/$GTEST_TARGET || true
 cd build/$GTEST_TARGET
 cmake -Dgtest_build_samples=ON \
-      -Dgmock_build_samples=ON \
       -Dgtest_build_tests=ON \
       -Dgmock_build_tests=ON \
       -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
-- 
cgit v1.2.3


From 14cf7f574a4fac65525620e552577b7f57c9b867 Mon Sep 17 00:00:00 2001
From: Herbert Thielen <thielen@hs-worms.de>
Date: Thu, 31 Aug 2017 16:10:36 +0200
Subject: fix example's comment

---
 googletest/docs/FAQ.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/googletest/docs/FAQ.md b/googletest/docs/FAQ.md
index 36f5f7fb..76c23727 100644
--- a/googletest/docs/FAQ.md
+++ b/googletest/docs/FAQ.md
@@ -1034,7 +1034,7 @@ namespace bar {
 TEST(CoolTest, DoSomething) {
   SUCCEED();
 }
-}  // namespace foo
+}  // namespace bar
 ```
 
 However, the following code is **not allowed** and will produce a runtime error from Google Test because the test methods are using different test fixture classes with the same test case name.
@@ -1052,7 +1052,7 @@ class CoolTest : public ::testing::Test {};  // Fixture: bar::CoolTest
 TEST_F(CoolTest, DoSomething) {
   SUCCEED();
 }
-}  // namespace foo
+}  // namespace bar
 ```
 
 ## How do I build Google Testing Framework with Xcode 4? ##
-- 
cgit v1.2.3