Merge branch 'master' into gtestapifix
060783b7d2b7
Actions

Authored by m-gupta <gupt.manoj@gmail.com> on Oct 25 2017, 19:24.

Description

Merge branch 'master' into gtestapifix

Committed

GitHub <noreply@github.com>

Oct 25 2017, 19:24

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:060783b7d2b7: Merge branch 'master' into gtestapifix (authored by m-gupta <gupt.manoj@gmail.com>).Oct 25 2017, 19:24

Commit	Author	Details	Committed
7684db32712e	Gennadiy Civil/GitHub	Merge pull request #1218 from KindDragon/vs-build-fix	Oct 25 2017
840c711e7bd7	Arkady Shapkin	Fix gmock tests when std::unary_function unavailable	Oct 25 2017
2641b021fc2a	Arkadiy Shapkin/Arkady Shapkin	Fix tests with VS2015 and VS2017	Oct 25 2017
77380cddf771	Arkadiy Shapkin/Arkady Shapkin	Enable C++11 features for VS2015 and VS2017	Oct 25 2017
6d0bb75c81bc	Gennadiy Civil/GitHub	Merge pull request #1139 from chehsunliu/master	Oct 24 2017
c208d8df23d6	Gennadiy Civil/GitHub	Merge branch 'master' into master	Oct 20 2017
3eaba9f07c5f	Che-Hsun Liu/GitHub	Merge branch 'master' into master	Aug 31 2017
24696c3958f0	Che-Hsun Liu/GitHub	Merge branch 'master' into master	Aug 14 2017
509f7fe84094	Che-Hsun Liu/GitHub	Update googletest README.md	Jul 2 2017

				Path
	M			.gitignore
	M			googlemock/test/gmock-generated-matchers_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googletest/README.md
	M			googletest/cmake/internal_utils.cmake
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/test/gtest-printers_test.cc
	M			googletest/test/gtest_catch_exceptions_test_.cc