Diffusion sp4e-homework-lars-bertil 3896e3b593c3

googletest
3896e3b593c3
Actions

Authored by Jerry Turcios <jerryturcios08@gmail.com> on Oct 30 2018, 02:09.

Description

Merge branch 'master' of https://github.com/google/googletest

Details

Committed

Jerry Turcios <jerryturcios08@gmail.com>

Oct 30 2018, 02:09

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:b9347b31c338: Googletest export
R9484:b8a03c80ad59: Merge branch 'master' of https://github.com/google/googletest

Branches

Unknown

Tags

Unknown

Event Timeline

Jerry Turcios <jerryturcios08@gmail.com> committed R9484:3896e3b593c3: Merge branch 'master' of https://github.com/google/googletest (authored by Jerry Turcios <jerryturcios08@gmail.com>).Oct 30 2018, 02:09

Merged Changes

Commit	Author	Details	Committed
b9347b31c338	misterg/Gennadiy Civil	Googletest export	Oct 29 2018
e9085769d481	Gennadiy Civil	Merge pull request #1941 from barkovv:master	Oct 29 2018
80b43d900b8e	misterg/Gennadiy Civil	Googletest export	Oct 29 2018
3feffddd1e83	Vadim Barkov	Replaced all NULLs with nullptr in googlemock	Oct 28 2018
53d61b5b2382	Vadim Barkov	Replaced all NULLs with nullptr in googletest	Oct 28 2018

Changes (36)

				Path
	M			googlemock/include/gmock/gmock-actions.h
	M			googlemock/include/gmock/gmock-cardinalities.h
	M			googlemock/include/gmock/gmock-generated-actions.h
	M			googlemock/include/gmock/gmock-generated-actions.h.pump
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-port.h
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/test/gmock-generated-actions_test.cc
	M			googlemock/test/gmock-generated-function-mockers_test.cc
	M			googlemock/test/gmock-internal-utils_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock-more-actions_test.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googlemock/test/gmock_link_test.h
	M			googlemock/test/gmock_stress_test.cc
	M			googletest/CMakeLists.txt
	M			googletest/Makefile.am
	M			googletest/include/gtest/gtest-message.h
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/internal/gtest-death-test-internal.h
	M			googletest/include/gtest/internal/gtest-internal.h
	D			googletest/include/gtest/internal/gtest-linked_ptr.h
	M			googletest/include/gtest/internal/gtest-param-util-generated.h
	M			googletest/include/gtest/internal/gtest-param-util-generated.h.pump
	M			googletest/include/gtest/internal/gtest-param-util.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-filepath.cc
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest.cc
	D			googletest/test/googletest-linked-ptr-test.cc
	M			googletest/test/googletest-test-part-test.cc
	M			googletest/test/gtest_all_test.cc
	M			googletest/test/gtest_unittest.cc