Diffusion sp4e-homework-lars-bertil 5c7c365d5f3e

Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
5c7c365d5f3e
Actions

Authored by Tanzinul Islam <t_17_7@hotmail.com> on Apr 1 2018, 14:43.

Description

Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116

Details

Committed

Tanzinul Islam <t_17_7@hotmail.com>

Apr 1 2018, 14:43

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:6d089311ca2a: Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.
R9484:7888184f2850: Include OSX builds back into PR builds

Branches

Unknown

Tags

Unknown

Event Timeline

Tanzinul Islam <t_17_7@hotmail.com> committed R9484:5c7c365d5f3e: Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 (authored by Tanzinul Islam <t_17_7@hotmail.com>).Apr 1 2018, 14:43

Merged Changes

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

Commit	Author	Details	Committed
7888184f2850	Gennadiy Civil/GitHub	Include OSX builds back into PR builds	Mar 29 2018
86d14079bee3	Gennadiy Civil/GitHub	Merge pull request #1527 from google/revert-1518-master	Mar 29 2018
b2373c6f5163	Gennadiy Civil/GitHub	Revert "merging gtest-port 1 of N"	Mar 29 2018
527fd3886704	Gennadiy Civil/GitHub	Merge pull request #1526 from google/revert-1525-master	Mar 29 2018
54bb165ffd0a	Gennadiy Civil/GitHub	Revert "merging gtest-port, 2"	Mar 29 2018
09a0e17c6a0d	Gennadiy Civil/GitHub	Merge pull request #1525 from gennadiycivil/master	Mar 29 2018
8e0364a37b68	Gennadiy Civil	merging gtest-port, 2	Mar 29 2018
9dde7c4e8c46	Gennadiy Civil/GitHub	Merge pull request #1518 from gennadiycivil/master	Mar 27 2018
aea6fc32aace	Gennadiy Civil	merging gtest-port 1 of N	Mar 27 2018
cafa9e52285d	Gennadiy Civil/GitHub	Merge pull request #1515 from gennadiycivil/master	Mar 26 2018
a75a5c9706b4	Gennadiy Civil	merges 1	Mar 26 2018
a0e2faf480e1	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Mar 26 2018
3df7cbe6f737	Gennadiy Civil	merges, gtest	Mar 26 2018
78579756a806	Gennadiy Civil/GitHub	Merge pull request #1512 from gennadiycivil/master	Mar 26 2018
6aae206bc297	Gennadiy Civil	merging gmock-matchers.h 3	Mar 26 2018
23187058e761	Gennadiy Civil	merging gmock-matchers.h 2	Mar 26 2018
8ea10d38784a	Gennadiy Civil	Upstreaming FloatingEq2Matcher,	Mar 26 2018
b907c26740f5	Gennadiy Civil	Merging gmock-matchers.h -2	Mar 23 2018
466a49ae3051	Gennadiy Civil	gmock-matchers merging -2	Mar 23 2018
a28a7eb5e9be	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Mar 22 2018
dfa853b63d17	Gennadiy Civil/GitHub	Merge pull request #1510 from gennadiycivil/master	Mar 22 2018
b7c568326c96	Gennadiy Civil	merging, gmock -1	Mar 22 2018
a1692ed133d7	Gennadiy Civil/GitHub	Merge branch 'master' into master	Mar 22 2018
4e89c76db836	Gennadiy Civil	reverting gtest_list_tests_unittest.py	Mar 22 2018
eaaa422c5265	Gennadiy Civil/GitHub	Update appveyor.yml	Mar 22 2018
da71e8c870d6	Gennadiy Civil	more merges	Mar 22 2018
0f6567954f42	Gennadiy Civil	more merges	Mar 22 2018
691e38e51833	Gennadiy Civil	More merges	Mar 21 2018
dccc2d67547a	Gennadiy Civil/GitHub	Merge pull request #1508 from gennadiycivil/master	Mar 19 2018
a3c2e107aeb7	Gennadiy Civil	cl 189032107, again	Mar 16 2018
080fcbe0aae2	Gennadiy Civil	cl 189032107	Mar 16 2018
a178cc7ef73c	Gennadiy Civil	merge, again, IsRecursiveContainer	Mar 15 2018
a325ad2db5de	Gennadiy Civil/GitHub	Merge pull request #1504 from gennadiycivil/master	Mar 14 2018
262aaf2f1dbf	Gennadiy Civil	erging, cont	Mar 14 2018
2814b4b08910	Gennadiy Civil	merging, merging	Mar 13 2018
a719320a3ce4	Gennadiy Civil	fixing, was removing too much	Mar 13 2018
5461f63d0120	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Mar 13 2018
af463c43ac22	Gennadiy Civil	More merges, removing old dead code	Mar 13 2018
f35fe6de3b25	Gennadiy Civil/GitHub	Merge pull request #1503 from sheepmaster/upstream_188748737	Mar 12 2018
fc437ef4b2c0	Bernhard Bauer/GitHub	Merge branch 'master' into upstream_188748737	Mar 12 2018
7b70413e0ca5	Bernhard Bauer	Allow macros inside of parametrized test names.	Mar 12 2018
abc6e943e087	Gennadiy Civil/GitHub	Merge pull request #1502 from gennadiycivil/master	Mar 12 2018
cf9d6344d280	Gennadiy Civil	merges-port(1)	Mar 12 2018
9bda90b7e5e0	Gennadiy Civil/GitHub	Merge pull request #1497 from gennadiycivil/master	Mar 7 2018
e89190066608	Gennadiy Civil	Merging, XML tests	Mar 7 2018
703b4a85a21e	Gennadiy Civil/GitHub	Merge pull request #1493 from gennadiycivil/master	Mar 5 2018
89d6f70f34a2	Gennadiy Civil	merges-8	Mar 5 2018
617e2c561578	Gennadiy Civil/GitHub	Merge pull request #1492 from gennadiycivil/master	Mar 5 2018
995a9dfa6941	Gennadiy Civil	merges-7	Mar 5 2018
ae4480f9232e	Gennadiy Civil/GitHub	Merge pull request #1491 from gennadiycivil/master	Mar 5 2018

Changes (34)

				Path
	M			.travis.yml
	M			appveyor.yml
	M			googlemock/include/gmock/gmock-actions.h
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/internal/custom/gmock-matchers.h
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/src/gmock-internal-utils.cc
	M			googlemock/src/gmock-matchers.cc
	M			googlemock/src/gmock.cc
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-internal-utils_test.cc
	M			googlemock/test/gmock_link_test.h
	M			googlemock/test/gmock_output_test_.cc
	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/internal/gtest-death-test-internal.h
	M			googletest/include/gtest/internal/gtest-internal.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/scripts/gen_gtest_pred_impl.py
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest.cc
	M			googletest/test/gtest-param-test_test.cc
	M			googletest/test/gtest-printers_test.cc
	M			googletest/test/gtest_env_var_test.py
	M			googletest/test/gtest_json_outfiles_test.py
	M			googletest/test/gtest_json_output_unittest.py
	M			googletest/test/gtest_json_test_utils.py
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_uninitialized_test.py
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_outfiles_test.py
	M			googletest/test/gtest_xml_output_unittest.py
	M			googletest/test/gtest_xml_test_utils.py