Merge branch 'master' into issue_1735

6de39826 · Jacob Schloss · GitHub · 6e798016 · 1d9a1912 · 6de39826
Unverified Commit 6de39826 authored Aug 22, 2018 by Jacob Schloss Committed by GitHub Aug 22, 2018
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

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

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

No files found.
--- a/googletest/test/production.cc
+++ b/googletest/test/production.cc
--- a/googletest/test/production.h
+++ b/googletest/test/production.h