Merge branch 'master' into missing-declarations
6b4967a23aae
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Jan 5 2018, 04:01.

Description

Merge branch 'master' into missing-declarations

Committed

GitHub <noreply@github.com>

Jan 5 2018, 04:01

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:6b4967a23aae: Merge branch 'master' into missing-declarations (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jan 5 2018, 04:01

Commit	Author	Details	Committed
abbc0f8174d9	Gennadiy Civil/GitHub	Merge pull request #1377 from davidben/clang-cl	Jan 5 2018
be6ee26a9b5b	Gennadiy Civil/GitHub	Merge pull request #1378 from gennadiycivil/master	Jan 4 2018
4216f869f77b	Gennadiy Civil/GitHub	Merge branch 'master' into master	Jan 4 2018
a5014476f0c4	Gennadiy Civil/GitHub	Merge pull request #1341 from coryan/fix-issue-776-support-autoconf-as-submodule	Jan 3 2018
1c09831acc69	Gennadiy Civil	upstreaming cl 124976692	Jan 3 2018
1acf8c752ee8	David Benjamin	Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.	Jan 3 2018
26addade175b	Gennadiy Civil/GitHub	Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule	Jan 3 2018
a9fa67cbe495	Gennadiy Civil/GitHub	Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule	Jan 3 2018
ec2b0c391261	Carlos O'Ryan	Build both googletest and googlemock.	Dec 24 2017
75b85d538295	Carlos O'Ryan	Create a autotools-based build for Travis.	Dec 24 2017
e76c3f837c83	Gennadiy Civil/GitHub	Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule	Dec 22 2017
b5b6a07d1422	Gennadiy Civil/GitHub	Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule	Dec 19 2017
f6c44fe3180a	Gennadiy Civil/GitHub	Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule	Dec 15 2017
a30e15b144b7	Gennadiy Civil/GitHub	Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule	Dec 8 2017
aea8580ecf44	Carlos O'Ryan	Run autoconf from top-level directory.	Dec 3 2017

				Path
	M			.gitignore
	M			.travis.yml
	A			Makefile.am
	P			ci/build-linux-autotools.sh Copied from ci/build-linux-bazel.sh
	P			ci/get-nprocessors.sh Copied from ci/env-linux.sh
	M			ci/travis.sh
	A			configure.ac
	M			googlemock/configure.ac
	M			googlemock/test/gmock-internal-utils_test.cc
	M			googletest/Makefile.am
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest-internal-inl.h
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest-test-part.cc
	M			googletest/src/gtest.cc
	M			googletest/test/gtest-death-test_test.cc
	M			googletest/test/gtest-filepath_test.cc
	M			googletest/test/gtest-options_test.cc
	M			googletest/test/gtest-param-test_test.cc
	M			googletest/test/gtest-port_test.cc
	M			googletest/test/gtest_color_test_.cc
	M			googletest/test/gtest_env_var_test_.cc
	M			googletest/test/gtest_environment_test.cc
	M			googletest/test/gtest_output_test_.cc
	M			googletest/test/gtest_repeat_test.cc
	M			googletest/test/gtest_stress_test.cc
	M			googletest/test/gtest_unittest.cc