Merge pull request #2 from google/master
130e5aa86a7a
Actions

Authored by Chris Johnson <chrisjohnsonmail@gmail.com> on Dec 14 2018, 20:11.

Description

Merge pull request #2 from google/master

merge upstream/master into master

Committed

GitHub <noreply@github.com>

Dec 14 2018, 20:11

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:130e5aa86a7a: Merge pull request #2 from google/master (authored by Chris Johnson <chrisjohnsonmail@gmail.com>).Dec 14 2018, 20:11

Commit	Author	Details	Committed
b5f5c596a991	Gennadiy Civil	Merge pull request #2000 from ciband:feat/add_support_platformio	Dec 14 2018
c6cb7e033591	Abseil Team/jueminyang	Googletest export	Dec 13 2018
81f00260668d	misterg/jueminyang	Googletest export	Dec 13 2018
3949c403c0ed	Gennadiy Civil/GitHub	Update README.md	Dec 13 2018
6ef591381372	Abseil Team/jueminyang	Googletest export	Dec 12 2018
b545089f5117	Gennadiy Civil/GitHub	Merge pull request #2004 from cotsog/patch-1	Dec 12 2018
3b1f43c2e7a5	Dominic Jodoin/GitHub	Use if statements	Dec 12 2018
fc0f92676865	Dominic Jodoin/GitHub	Don't cache APT packages on OS X/macOS	Dec 12 2018
ea5e941d8470	Dominic Jodoin/GitHub	Change directory ownership earlier	Dec 12 2018
6cbd3753dc19	misterg/Gennadiy Civil	Googletest export	Dec 11 2018
06bb8d4d6dcf	Abseil Team/Gennadiy Civil	Googletest export	Dec 11 2018
b5c08cb9f4f1	Dominic Jodoin/GitHub	Cache gcc and clang APT packages	Dec 10 2018
31eb5e9b873a	Chris Johnson/GitHub	chore: Update version to latest release	Dec 7 2018
d9251df84951	Chris Johnson/GitHub	fix: Remove global chmod from Travis	Dec 6 2018
39c09043b83e	Chris Johnson/GitHub	chore: Add initial library.json config	Dec 6 2018
695cf7c96249	Gennadiy Civil	Merge pull request #1997 from gpakosz:GTEST_IS_THREADSAFE	Dec 5 2018
2c8ab3f18b2e	Chris Johnson/GitHub	feat: Add initial support for PlatformIO and Arduino	Dec 5 2018
067aa4c28bb1	Gregory Pakosz	Do not define GTEST_IS_THREADSAFE within GTEST_HAS_SEH	Dec 4 2018

				Path
	M			.travis.yml
	M			CONTRIBUTING.md
	A			ci/build-platformio.sh
	A			ci/install-platformio.sh
	M			googlemock/cmake/gmock.pc.in
	M			googlemock/cmake/gmock_main.pc.in
	M			googlemock/include/gmock/gmock-generated-actions.h
	M			googlemock/include/gmock/gmock-generated-actions.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/src/gmock-spec-builders.cc
	M			googlemock/src/gmock_main.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock-spec-builders_test.cc
	M			googlemock/test/gmock_output_test_golden.txt
	M			googletest/cmake/gtest.pc.in
	M			googletest/cmake/gtest_main.pc.in
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest.cc
	M			googletest/src/gtest_main.cc
	M			googletest/test/googletest-json-output-unittest.py
	M			googletest/test/gtest_xml_output_unittest.py
	M			googletest/test/gtest_xml_output_unittest_.cc
	A			library.json
	A			platformio.ini