Merge branch 'master' into relocatable-pkgconfig-fix
754cb8ed9643
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Oct 12 2018, 18:44.

Description

Merge branch 'master' into relocatable-pkgconfig-fix

Committed

GitHub <noreply@github.com>

Oct 12 2018, 18:44

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:754cb8ed9643: Merge branch 'master' into relocatable-pkgconfig-fix (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Oct 12 2018, 18:44

Commit	Author	Details	Committed
864b6c2d35db	misterg/Gennadiy Civil	Remove duplicate functionality PrintValue (in googletest-param-test-test.cc)…	Oct 11 2018
b3b19a796cbb	KO Myung-Hun/Gennadiy Civil	Merge c41b2bf861ef2ac1a975af05ff66d9256f280b01 into…	Oct 11 2018
f203b2db7716	Gennadiy Civil/GitHub	Merge pull request #1902 from theryee/typo	Oct 11 2018
ad997b16b5f9	David Neto/Gennadiy Civil	Merge 4c92120d6dedb4eeb499a8702faea0224e0a8b23 into…	Oct 11 2018
e7327c13f6f2	Aaron Dierking/Gennadiy Civil	Merge 41fc9745d4a448db7d932250d22fac1dda287443 into…	Oct 11 2018
bc6a4ce38086	Abseil Team/Gennadiy Civil	Project import generated by Copybara.	Oct 11 2018
0e71eb069a79	misterg/Gennadiy Civil	Internal Change	Oct 11 2018
4d50ab75a730	Ryan Yee/GitHub	Merge branch 'master' into typo	Oct 11 2018
a83429f5d31a	Ryan Yee	fix typo	Oct 11 2018

				Path
	M			ci/env-osx.sh
	M			googletest/cmake/internal_utils.cmake
	M			googletest/include/gtest/internal/gtest-port-arch.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest-printers.cc
	M			googletest/src/gtest.cc
	M			googletest/test/googletest-filepath-test.cc
	M			googletest/test/googletest-options-test.cc
	M			googletest/test/googletest-param-test-test.cc
	M			googletest/test/gtest_test_utils.py