Merge branch 'master' into master

24696c39 · Che-Hsun Liu · GitHub · 509f7fe8 · 673c975a · 509f7fe8
Commit 24696c39 authored Aug 14, 2017 by Che-Hsun Liu Committed by GitHub Aug 14, 2017
20 changed files
--- a/googletest/docs/V1_7_XcodeGuide.md
+++ b/googletest/docs/V1_7_XcodeGuide.md
--- a/googletest/docs/XcodeGuide.md
+++ b/googletest/docs/XcodeGuide.md
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
--- a/googletest/samples/sample1.cc
+++ b/googletest/samples/sample1.cc
--- a/googletest/samples/sample10_unittest.cc
+++ b/googletest/samples/sample10_unittest.cc
--- a/googletest/samples/sample1_unittest.cc
+++ b/googletest/samples/sample1_unittest.cc
--- a/googletest/samples/sample2_unittest.cc
+++ b/googletest/samples/sample2_unittest.cc
--- a/googletest/samples/sample3_unittest.cc
+++ b/googletest/samples/sample3_unittest.cc
--- a/googletest/samples/sample4_unittest.cc
+++ b/googletest/samples/sample4_unittest.cc
--- a/googletest/samples/sample5_unittest.cc
+++ b/googletest/samples/sample5_unittest.cc
--- a/googletest/samples/sample6_unittest.cc
+++ b/googletest/samples/sample6_unittest.cc
--- a/googletest/samples/sample7_unittest.cc
+++ b/googletest/samples/sample7_unittest.cc
--- a/googletest/samples/sample8_unittest.cc
+++ b/googletest/samples/sample8_unittest.cc
--- a/googletest/samples/sample9_unittest.cc
+++ b/googletest/samples/sample9_unittest.cc
--- a/googletest/scripts/upload.py
+++ b/googletest/scripts/upload.py
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
--- a/googletest/src/gtest-port.cc
+++ b/googletest/src/gtest-port.cc
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
--- a/googletest/test/BUILD.bazel
+++ b/googletest/test/BUILD.bazel
--- a/googletest/test/gtest-port_test.cc
+++ b/googletest/test/gtest-port_test.cc