Merge branch 'master' into assert
b324a36c35c1
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Feb 9 2018, 17:42.

Description

Merge branch 'master' into assert

Committed

GitHub <noreply@github.com>

Feb 9 2018, 17:42

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:b324a36c35c1: Merge branch 'master' into assert (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Feb 9 2018, 17:42

Commit	Author	Details	Committed
22a115055a34	Gennadiy Civil/GitHub	Merge pull request #1446 from tholsapp/master	Feb 9 2018
c211f21906ca	Gennadiy Civil/GitHub	Merge pull request #1448 from gennadiycivil/master	Feb 9 2018
ec7faa943d78	Gennadiy Civil	merges	Feb 9 2018
c8510504ddf3	Troy Holsapple	Fixed typos	Feb 8 2018
a3c73ed28d79	Gennadiy Civil/GitHub	Include MSVC14 on PRs as well	Feb 6 2018

				Path
	M			appveyor.yml
	M			googlemock/docs/CookBook.md
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/scripts/generator/cpp/ast.py
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock_output_test.py
	M			googlemock/test/gmock_test_utils.py
	M			googletest/docs/FAQ.md
	M			googletest/include/gtest/internal/gtest-filepath.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-printers.cc
	M			googletest/src/gtest.cc
	M			googletest/test/gtest-printers_test.cc
	M			googletest/test/gtest_env_var_test.py
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_unittest.cc
	M			googletest/xcode/Scripts/versiongenerate.py