Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch" This reverts commit 9ba9358ecb. Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)" This reverts commit f185802489.
2018-06-04 19:24:09 +03:00
parent 80709697e5 b2cff44084
commit 45dd575ed2
147 changed files with 5707 additions and 2831 deletions
@@ -10441,5 +10441,7 @@ const char* TypedTestCasePState::VerifyRegisteredTestNames(

 #endif  // GTEST_HAS_TYPED_TEST_P

+void* g_parameter_ = NULL;
+
 }  // namespace internal
 }  // namespace testing