Merge branch 'master' into fix-core-dump-shared

f6887b5c · Gennadiy Civil · GitHub · 0e6da4ce · 63ded6c2 · f6887b5c
Unverified Commit f6887b5c authored Jan 13, 2018 by Gennadiy Civil Committed by GitHub Jan 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

googletest/test/production.cc googletest/test/production.cc +1 -1

googletest/test/production.h googletest/test/production.h +1 -1

No files found.
--- a/googletest/test/production.cc
+++ b/googletest/test/production.cc
@@ -29,7 +29,7 @@
 //
 // Author: wan@google.com (Zhanyong Wan)
 //
-// This is part of the unit test for include/gtest/gtest_prod.h.
+// This is part of the unit test for gtest_prod.h.

 #include "production.h"


--- a/googletest/test/production.h
+++ b/googletest/test/production.h
@@ -29,7 +29,7 @@
 //
 // Author: wan@google.com (Zhanyong Wan)
 //
-// This is part of the unit test for include/gtest/gtest_prod.h.
+// This is part of the unit test for gtest_prod.h.

 #ifndef GTEST_TEST_PRODUCTION_H_
 #define GTEST_TEST_PRODUCTION_H_