Diffusion sp4e-homework-lars-bertil 274b39bfa0b7

googletest
274b39bfa0b7
Actions

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

Description

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

Details

Committed

Jerry Turcios <jerryturcios08@gmail.com>

Oct 10 2018, 02:47

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:78761b58fc9a: Remove non-variadic pre C++11 AnyOf
R9484:a113467a4e7e: Merge branch 'master' of https://github.com/google/googletest

Branches

Unknown

Tags

Unknown

Event Timeline

Jerry Turcios <jerryturcios08@gmail.com> committed R9484:274b39bfa0b7: Merge branch 'master' of https://github.com/google/googletest (authored by Jerry Turcios <jerryturcios08@gmail.com>).Oct 10 2018, 02:47

Merged Changes

Commit	Author	Details	Committed
78761b58fc9a	misterg/Gennadiy Civil	Remove non-variadic pre C++11 AnyOf	Oct 9 2018
7d3b73c85a42	Abseil Team/Gennadiy Civil	Unconditionally use std::tuple. Remove all mention of TR1 tuple and our own…	Oct 9 2018
5434989dbd8a	misterg/Gennadiy Civil	Remove testing::internal::BothOfMatcher, no longer needed	Oct 9 2018
b652edb39c7e	Abseil Team/Gennadiy Civil	Apply [[noreturn]] to Abort()	Oct 9 2018
7a1e9114a475	Gennadiy Civil/GitHub	Update Makefile.am	Oct 9 2018
689ac9fbd013	Gennadiy Civil/GitHub	Update BUILD.bazel	Oct 9 2018
5ae4f6222584	Gennadiy Civil/GitHub	Update README.md	Oct 9 2018
272c08380af5	Gennadiy Civil/GitHub	Delete CHANGES	Oct 9 2018
ac7ed4046c35	Gennadiy Civil/GitHub	Delete CHANGES	Oct 9 2018

Changes (39)

				Path
	M			README.md
	D			googlemock/CHANGES
	M			googlemock/CMakeLists.txt
	M			googlemock/include/gmock/gmock-actions.h
	M			googlemock/include/gmock/gmock-generated-actions.h
	M			googlemock/include/gmock/gmock-generated-actions.h.pump
	M			googlemock/include/gmock/gmock-generated-function-mockers.h
	M			googlemock/include/gmock/gmock-generated-function-mockers.h.pump
	M			googlemock/include/gmock/gmock-generated-matchers.h
	M			googlemock/include/gmock/gmock-generated-matchers.h.pump
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-more-actions.h
	M			googlemock/include/gmock/internal/gmock-generated-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-generated-actions_test.cc
	M			googlemock/test/gmock-generated-internal-utils_test.cc
	M			googlemock/test/gmock-generated-matchers_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
	D			googletest/CHANGES
	M			googletest/CMakeLists.txt
	M			googletest/Makefile.am
	M			googletest/cmake/internal_utils.cmake
	M			googletest/include/gtest/gtest-param-test.h
	M			googletest/include/gtest/gtest-param-test.h.pump
	M			googletest/include/gtest/gtest-printers.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-port.h
	D			googletest/include/gtest/internal/gtest-tuple.h
	D			googletest/include/gtest/internal/gtest-tuple.h.pump
	M			googletest/samples/sample8_unittest.cc
	M			googletest/test/BUILD.bazel
	M			googletest/test/googletest-param-test-test.cc
	M			googletest/test/googletest-printers-test.cc
	D			googletest/test/googletest-tuple-test.cc