Diffusion sp4e-homework-lars-bertil 27bb844e5c31

Merge branch 'master' into fix-argc
27bb844e5c31
Actions

Authored by Conor Burgess <Burgess.Conor@gmail.com> on Jan 12 2018, 17:00.

Description

Merge branch 'master' into fix-argc

Details

Committed

GitHub <noreply@github.com>

Jan 12 2018, 17:00

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:8f90d46c8cdd: Merge branch 'master' into fix-argc
R9484:ed8d02cfc689: Update .travis.yml

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:27bb844e5c31: Merge branch 'master' into fix-argc (authored by Conor Burgess <Burgess.Conor@gmail.com>).Jan 12 2018, 17:00

Merged Changes

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

Commit	Author	Details	Committed
ed8d02cfc689	Gennadiy Civil/GitHub	Update .travis.yml	Jan 11 2018
73d1251fe9a9	Gennadiy Civil/GitHub	Update .travis.yml	Jan 11 2018
cfd29e04880f	Gennadiy Civil/GitHub	Update .travis.yml	Jan 11 2018
29f94e010624	Gennadiy Civil/GitHub	Update .travis.yml	Jan 11 2018
13218917c859	Gennadiy Civil/GitHub	Merge pull request #1399 from gennadiycivil/master	Jan 11 2018
5add34775c03	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 11 2018
6914ae239499	Gennadiy Civil	Upstream cl 103120214	Jan 11 2018
836c419c0d8e	Gennadiy Civil/GitHub	Merge pull request #1398 from gennadiycivil/master	Jan 11 2018
1d757db65cd1	Gennadiy Civil	More merge, cleanup	Jan 10 2018
b44ed2190507	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 10 2018
481fe9446a1d	Gennadiy Civil	More merge, cleanup	Jan 10 2018
cac5d7ce1a50	Gennadiy Civil/GitHub	Merge pull request #1397 from gennadiycivil/master	Jan 10 2018
84aa45941fdf	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 10 2018
6a26e47cfcc1	Gennadiy Civil	Code merge, upstreaming accumulated changes, cleanup	Jan 10 2018
d7196896bb83	Gennadiy Civil/GitHub	Merge pull request #1396 from gennadiycivil/master	Jan 10 2018
62dbaa2947f7	Gennadiy Civil	revert	Jan 10 2018
d630a8bdacf2	Gennadiy Civil	code merges, cleanup	Jan 10 2018
6efe104aed8d	Gennadiy Civil/GitHub	Merge pull request #1395 from gennadiycivil/master	Jan 10 2018
f33902b97a76	Gennadiy Civil	revert googletest/test/gtest-param-test_test.cc	Jan 10 2018
f729a2867ed8	Gennadiy Civil	Merge branch 'master' of github.com:gennadiycivil/googletest	Jan 10 2018
8034001188a0	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 10 2018
505de1d6e201	Gennadiy Civil/GitHub	Merge branch 'master' into master	Jan 10 2018
6eccdb7b62d5	Gennadiy Civil/GitHub	Update .travis.yml	Jan 10 2018
2f31bfab6b60	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 10 2018
d237297cebc1	Gennadiy Civil	code merge, cleanups	Jan 10 2018
509e78be2388	Gennadiy Civil/GitHub	Merge pull request #1394 from gennadiycivil/master	Jan 10 2018
2ad5661db2ac	Gennadiy Civil	Upstream of cl 129104714	Jan 9 2018
5eecadf67afb	Gennadiy Civil	Revert one file	Jan 9 2018
9fce984a6770	Gennadiy Civil	wip, cleanups/merge	Jan 9 2018
23015249236e	Gennadiy Civil/GitHub	Merge pull request #1393 from gennadiycivil/master	Jan 9 2018
1df907381de5	Gennadiy Civil/GitHub	Merge branch 'master' into master	Jan 9 2018
258fd6e16820	Gennadiy Civil	cleanup, merge	Jan 9 2018
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

Changes (87)

		Path
M		.gitignore
M		.travis.yml
M		BUILD.bazel
A		CONTRIBUTING.md
A		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/build-aux
D		googletest/build-aux/.keep
D		googletest/docs/DevGuide.md
M		googletest/docs/Documentation.md
M		googletest/include/gtest/gtest-death-test.h
M		googletest/include/gtest/gtest-message.h
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-typed-test.h
M		googletest/include/gtest/gtest.h
M		googletest/include/gtest/internal/custom/gtest-port.h
M		googletest/include/gtest/internal/custom/gtest.h
M		googletest/include/gtest/internal/gtest-death-test-internal.h
M		googletest/include/gtest/internal/gtest-filepath.h
M		googletest/include/gtest/internal/gtest-internal.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/include/gtest/internal/gtest-string.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-filepath.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-printers_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
M		googletest/test/production.cc
M		googletest/test/production.h
V		{ → ci}/travis.sh