Many code merge/upstream changes

2018-01-23 12:33:54 -05:00
parent 58df576056
commit 80defcec57
16 changed files with 93 additions and 35 deletions
--- a/googletest/test/gtest-param-test2_test.cc
+++ b/googletest/test/gtest-param-test2_test.cc
@@ -33,7 +33,7 @@
 // Google Test work.

 #include "gtest/gtest.h"
-#include "test/gtest-param-test_test.h"
+#include "gtest-param-test_test.h"

 using ::testing::Values;
 using ::testing::internal::ParamGenerator;