Merge pull request #1417 from gennadiycivil/master
3c5e064ca089
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Jan 23 2018, 18:32.

Description

Merge pull request #1417 from gennadiycivil/master

merges, cl/155419551 and others

Committed

GitHub <noreply@github.com>

Jan 23 2018, 18:32

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:3c5e064ca089: Merge pull request #1417 from gennadiycivil/master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jan 23 2018, 18:32

Commit	Author	Details	Committed
58df5760569f	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 23 2018
6723b6c588e2	Gennadiy Civil	Merging, upstream http://cl/182836545	Jan 23 2018
bbb17ad0f78c	Gennadiy Civil	more code merge	Jan 22 2018
f1c87ad9f518	Gennadiy Civil	merges, cl/155419551 and other	Jan 22 2018

				Path
	M			googletest/include/gtest/gtest.h
	M			googletest/src/gtest.cc
	M			googletest/test/gtest_repeat_test.cc
	M			googletest/test/gtest_uninitialized_test.py
	M			googletest/test/gtest_uninitialized_test_.cc
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_output_unittest.py
	M			googletest/test/gtest_xml_test_utils.py