Merge branch 'refs/heads/master' into flag-default

c0037332 · Alyssa Wilk · a2803bc3 · b43bfcf4 · a2803bc3 · a2803bc3
Commit c0037332 authored Aug 28, 2017 by Alyssa Wilk
20 changed files
--- a/googletest/docs/V1_6_PumpManual.md
+++ b/googletest/docs/V1_6_PumpManual.md
--- a/googletest/docs/V1_6_Samples.md
+++ b/googletest/docs/V1_6_Samples.md
--- a/googletest/docs/V1_6_XcodeGuide.md
+++ b/googletest/docs/V1_6_XcodeGuide.md
--- a/googletest/docs/V1_7_AdvancedGuide.md
+++ b/googletest/docs/V1_7_AdvancedGuide.md
--- a/googletest/docs/V1_7_Documentation.md
+++ b/googletest/docs/V1_7_Documentation.md
--- a/googletest/docs/V1_7_FAQ.md
+++ b/googletest/docs/V1_7_FAQ.md
--- a/googletest/docs/V1_7_Primer.md
+++ b/googletest/docs/V1_7_Primer.md
--- a/googletest/docs/V1_7_PumpManual.md
+++ b/googletest/docs/V1_7_PumpManual.md
--- a/googletest/docs/V1_7_Samples.md
+++ b/googletest/docs/V1_7_Samples.md
--- 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/gtest-printers.h
+++ b/googletest/include/gtest/gtest-printers.h
--- a/googletest/include/gtest/internal/gtest-internal.h
+++ b/googletest/include/gtest/internal/gtest-internal.h
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
--- a/googletest/msvc/2010/gtest-md.sln
+++ b/googletest/msvc/2010/gtest-md.sln
--- a/googletest/msvc/2010/gtest-md.vcxproj
+++ b/googletest/msvc/2010/gtest-md.vcxproj
--- a/googletest/msvc/2010/gtest-md.vcxproj.filters
+++ b/googletest/msvc/2010/gtest-md.vcxproj.filters
--- a/googletest/msvc/2010/gtest.sln
+++ b/googletest/msvc/2010/gtest.sln
--- a/googletest/msvc/2010/gtest.vcxproj
+++ b/googletest/msvc/2010/gtest.vcxproj
--- a/googletest/msvc/2010/gtest.vcxproj.filters
+++ b/googletest/msvc/2010/gtest.vcxproj.filters