Diffusion sp4e-homework-lars-bertil 0e6da4cead72

Merge branch 'master' into fix-core-dump-shared
0e6da4cead72
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Jan 9 2018, 06:22.

Description

Merge branch 'master' into fix-core-dump-shared

Details

Committed

GitHub <noreply@github.com>

Jan 9 2018, 06:22

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:cdedd189b22a: Merge branch 'master' into fix-core-dump-shared
R9484:e194f52114a1: Merge pull request #1388 from rongjiecomputer/bazel

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:0e6da4cead72: Merge branch 'master' into fix-core-dump-shared (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jan 9 2018, 06:22

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
e194f52114a1	Gennadiy Civil/GitHub	Merge pull request #1388 from rongjiecomputer/bazel	Jan 9 2018
cbd15d417e9a	Loo Rong Jie	[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc	Jan 9 2018
c3bb0ee2a632	Gennadiy Civil/GitHub	Merge pull request #1390 from gennadiycivil/master	Jan 8 2018
91ba05cc360a	Gennadiy Civil	Small cleanups, merge	Jan 8 2018
3d27bdef53a5	Gennadiy Civil/GitHub	Merge pull request #1387 from coryan/optimize-build-matrix-ready	Jan 8 2018
4371b996edb2	Gennadiy Civil/GitHub	Merge pull request #1385 from gennadiycivil/master	Jan 6 2018
fab06101d709	Gennadiy Civil/GitHub	Merge branch 'master' into master	Jan 5 2018
67d6e467285d	Carlos O'Ryan	Use correct name for build event types.	Jan 5 2018
67476c1426dc	Gennadiy Civil	Revert one file for now	Jan 5 2018
adfdc65ca7ed	Carlos O'Ryan	Fixed test for pull request.	Jan 5 2018
5b26b0fce73e	Gennadiy Civil/GitHub	Merge pull request #1007 from davidben/missing-declarations	Jan 5 2018
d3acb4ba18a5	Carlos O'Ryan	Fixed output and test for 'enabled_on_pr'	Jan 5 2018
6b4967a23aae	Gennadiy Civil/GitHub	Merge branch 'master' into missing-declarations	Jan 5 2018
abbc0f8174d9	Gennadiy Civil/GitHub	Merge pull request #1377 from davidben/clang-cl	Jan 5 2018
19b5774ccf6c	Gennadiy Civil	code cleanup in preparation for merges, cl 180857299	Jan 5 2018
9cee677ce40d	Carlos O'Ryan/GitHub	Optimize build matrix (#1)	Jan 4 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
b3d9be5c1d96	David Benjamin	Pass the -Wmissing-declarations warning.	Jan 3 2018
26addade175b	Gennadiy Civil/GitHub	Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule	Jan 3 2018
ba6ecedede74	Gennadiy Civil/GitHub	Merge pull request #1374 from davidben/tuple-msvc	Jan 3 2018
88760a299f56	Gennadiy Civil/GitHub	Merge pull request #991 from davidben/uintptr	Jan 3 2018
a3da63d97ace	Gennadiy Civil/GitHub	Merge branch 'master' into tuple-msvc	Jan 3 2018
a9fa67cbe495	Gennadiy Civil/GitHub	Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule	Jan 3 2018
1414d71af0c0	Samuel Benzaquen/GitHub	Merge pull request #1376 from gennadiycivil/master	Jan 3 2018
e7734fb80cac	misterg	OSS Sync, cl 163329677	Jan 2 2018
90244a6aef73	David Benjamin	Fix testing::Combine on MSVC 2017.	Jan 2 2018
fa6730103eca	Gennadiy Civil/GitHub	Merge branch 'master' into uintptr	Jan 2 2018
1c2f19070472	Gennadiy Civil/GitHub	Merge pull request #1109 from davidben/vs2017	Jan 2 2018
bcd35523cd7c	David Benjamin	Avoid warning C4619 in MSVC 2017.	Dec 25 2017
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
5490beb0602e	Gennadiy Civil/GitHub	Merge pull request #778 from gpakosz/C4389	Dec 22 2017
7990f56637d6	Gregory Pakosz	Re-enable MSVC++ C4389 warning in CmdHelperEq()	Dec 21 2017
0062e4869f07	Gennadiy Civil/GitHub	Merge pull request #1357 from bryanzim/master	Dec 20 2017
e17907da8039	bryanzim/GitHub	Update internal_utils.cmake	Dec 20 2017
773cc7876532	bryanzim/GitHub	Merge branch 'master' into master	Dec 20 2017
b5b6a07d1422	Gennadiy Civil/GitHub	Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule	Dec 19 2017
a37eedc3c15e	Gennadiy Civil/GitHub	Merge pull request #1248 from aninf-wo/hethi/issue-360-remove…	Dec 19 2017
782384d11ff4	Gennadiy Civil/GitHub	Merge pull request #1212 from qzmfranklin/bazel	Dec 19 2017
a7fceb4a98a7	Gennadiy Civil/GitHub	Update gtest-param-test.h.pump	Dec 19 2017
8a48f0ed4e0f	Gennadiy Civil/GitHub	Update gtest-param-test.h.pump	Dec 19 2017
058b318bc703	Gennadiy Civil/GitHub	Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS	Dec 18 2017
a7bd3725f08f	Gennadiy Civil/GitHub	Merge branch 'master' into bazel	Dec 18 2017
8cbda54f48bd	bryanzim/GitHub	Merge branch 'master' into master	Dec 15 2017
f6c44fe3180a	Gennadiy Civil/GitHub	Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule	Dec 15 2017

Changes (72)

		Path
M		.gitignore
M		.travis.yml
M		BUILD.bazel
A		CONTRIBUTING.md
P		LICENSE Copied from googlemock/LICENSE
A		Makefile.am
M		README.md
M		appveyor.yml
A	(dir)	ci/
P		ci/build-linux-autotools.sh Copied from googlemock/test/BUILD.bazel
P		ci/build-linux-bazel.sh Copied from googlemock/test/BUILD.bazel
P		ci/env-linux.sh Copied from googlemock/test/BUILD.bazel
P		ci/env-osx.sh Copied from googlemock/test/BUILD.bazel
P		ci/get-nprocessors.sh Copied from googlemock/test/BUILD.bazel
P		ci/install-linux.sh Copied from googlemock/test/BUILD.bazel
P		ci/install-osx.sh Copied from googlemock/test/BUILD.bazel
P		ci/log-config.sh Copied from googlemock/test/BUILD.bazel
V		{ci ← }/travis.sh
A		configure.ac
M		googlemock/CMakeLists.txt
M		googlemock/README.md
M		googlemock/configure.ac
D		googlemock/docs/DevGuide.md
M		googlemock/docs/Documentation.md
M		googlemock/include/gmock/gmock-matchers.h
M		googlemock/src/gmock-spec-builders.cc
P		googlemock/test/BUILD.bazel Copied to multiple locations: ci/build-linux-autotools.sh ci/build-linux-bazel.sh ci/env-linux.sh ci/env-osx.sh ci/get-nprocessors.sh ci/install-linux.sh ci/install-osx.sh ci/log-config.sh
M		googlemock/test/gmock-internal-utils_test.cc
M		googlemock/test/gmock-matchers_test.cc
M		googletest/CMakeLists.txt
M		googletest/Makefile.am
M		googletest/README.md
D		googletest/docs/DevGuide.md
M		googletest/docs/Documentation.md
M		googletest/include/gtest/gtest-param-test.h
M		googletest/include/gtest/gtest-param-test.h.pump
M		googletest/include/gtest/gtest-printers.h
M		googletest/include/gtest/gtest.h
M		googletest/include/gtest/internal/gtest-param-util-generated.h
M		googletest/include/gtest/internal/gtest-param-util-generated.h.pump
M		googletest/include/gtest/internal/gtest-param-util.h
M		googletest/include/gtest/internal/gtest-port.h
M		googletest/samples/prime_tables.h
M		googletest/samples/sample4_unittest.cc
M		googletest/samples/sample5_unittest.cc
M		googletest/samples/sample7_unittest.cc
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/BUILD.bazel
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-test2_test.cc
M		googletest/test/gtest-param-test_test.cc
M		googletest/test/gtest-param-test_test.h
M		googletest/test/gtest-port_test.cc
M		googletest/test/gtest_break_on_failure_unittest_.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_filter_unittest_.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
M		googletest/test/gtest_xml_outfile1_test_.cc
M		googletest/test/gtest_xml_outfile2_test_.cc
M		googletest/test/gtest_xml_output_unittest_.cc
V		{ → ci}/travis.sh