Merge branch 'fix_death_test_child_mingw_wer_issue1116' of...

Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116

Merge branch 'fix_death_test_child_mingw_wer_issue1116' of...
Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116
6d089311 · Tanzinul Islam · 555e6e79 · a7a7f51d · 6d089311 · 6d089311
Commit 6d089311 authored Mar 05, 2018 by Tanzinul Islam
Expand all Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

googletest/xcode/Scripts/versiongenerate.py googletest/xcode/Scripts/versiongenerate.py +1 -1

No files found.
--- a/googletest/test/production.h
+++ b/googletest/test/production.h
--- a/googletest/xcode/Scripts/versiongenerate.py
+++ b/googletest/xcode/Scripts/versiongenerate.py