Diffusion sp4e-homework-lars-bertil 1cd979a80701

Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
1cd979a80701
Actions

Authored by Tanzinul Islam <t_17_7@hotmail.com> on Aug 1 2018, 23:48.

Description

Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116

Details

Committed

Tanzinul Islam <t_17_7@hotmail.com>

Aug 1 2018, 23:48

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:3280099951c5: Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
R9484:e5e2ef7cd27c: Merge pull request #1695 from gennadiycivil/master

Branches

Unknown

Tags

Unknown

Event Timeline

Tanzinul Islam <t_17_7@hotmail.com> committed R9484:1cd979a80701: Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 (authored by Tanzinul Islam <t_17_7@hotmail.com>).Aug 1 2018, 23:48

Merged Changes

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

Commit	Author	Details	Committed
e5e2ef7cd27c	Gennadiy Civil/GitHub	Merge pull request #1695 from gennadiycivil/master	Aug 1 2018
16c65a476a12	Gennadiy Civil/GitHub	Merge branch 'master' into master	Aug 1 2018
572b07ff8d93	Gennadiy Civil/GitHub	Merge pull request #1685 from einsteinsfool/master	Aug 1 2018
e69a1a83402d	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Aug 1 2018
539ee4bc5498	Gennadiy Civil	Formatting changes and upstreaming one test	Aug 1 2018
f978c651ed73	Gennadiy Civil/GitHub	Merge branch 'master' into master	Jul 30 2018
4f160f737078	Gennadiy Civil/GitHub	Merge pull request #1691 from gennadiycivil/master	Jul 30 2018
012528ccab97	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jul 30 2018
b7cb1bc6f9d6	Gennadiy Civil	small tweaks, OSS merge cl 206357486	Jul 30 2018
00486476193b	Gennadiy Civil/GitHub	Merge pull request #1688 from gennadiycivil/master	Jul 27 2018
ec13264af459	Gennadiy Civil	added missing comments	Jul 27 2018
984cba30ed10	Gennadiy Civil	Formatting changes for automatic code management	Jul 27 2018
309e8a271e9a	Piotr Kąkol	Updated broken and outdated URLs	Jul 25 2018
40904f897048	Gennadiy Civil/GitHub	Merge pull request #1684 from gennadiycivil/master	Jul 25 2018
ed1edf641dc5	Gennadiy Civil	Formatting changes, code sync	Jul 25 2018
78b49242d1de	Gennadiy Civil/GitHub	Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jp	Jul 24 2018
a68f0c201de5	Gennadiy Civil/GitHub	Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp	Jul 23 2018
82c858b3add3	Gennadiy Civil/GitHub	Merge pull request #1678 from stianval/master	Jul 23 2018
bb9fc6f66e49	Stian Valle/GitHub	Update primer.md	Jul 21 2018
7abf99d941ba	Stian Valle/GitHub	Update primer.md	Jul 21 2018
baf2115a5927	Stian Valle/GitHub	Update primer.md	Jul 21 2018
534570b5bd8d	Masaru Tsuchiyama/GitHub	Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp	Jul 21 2018
2a151c93c180	Gennadiy Civil/GitHub	Merge pull request #1676 from gennadiycivil/master	Jul 20 2018
a02af2f68942	Gennadiy Civil	code merge	Jul 20 2018
c62c79432bd2	Gennadiy Civil/GitHub	Merge pull request #1668 from duxiuxing/googletest_for_asam	Jul 20 2018
d8db0ca9cf22	duxiuxing/GitHub	Merge branch 'master' into googletest_for_asam	Jul 20 2018
2eb439600764	杜修杏	Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio	Jul 20 2018
6ce9b98f541b	Gennadiy Civil/GitHub	Merge pull request #1674 from gennadiycivil/master	Jul 19 2018
61b819721758	Gennadiy Civil/GitHub	Merge branch 'master' into master	Jul 19 2018
0c17888bcfa7	Gennadiy Civil	code sync	Jul 19 2018
5b19054b0240	duxiuxing/GitHub	Merge branch 'master' into googletest_for_asam	Jul 19 2018
40cd5d117035	Masaru Tsuchiyama/GitHub	Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp	Jul 18 2018
1370e7658b65	Gennadiy Civil/GitHub	Merge pull request #1669 from syohex/ignore-ds-store	Jul 18 2018
a3509a5aa49e	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jul 18 2018
43163c19d5ab	Gennadiy Civil/GitHub	Merge branch 'master' into ignore-ds-store	Jul 18 2018
4235fff7f4c3	Gennadiy Civil/GitHub	Merge pull request #1671 from gennadiycivil/master	Jul 18 2018
3530ab9e437b	Gennadiy Civil	Code sync	Jul 18 2018
d41bfd732f39	Gennadiy Civil	Fix link	Jul 18 2018
8d07cfd05323	Gennadiy Civil	Code sync, mostly formatting and removing outdates	Jul 18 2018
7e73a7ae6e66	Gennadiy Civil	Formatting and a link	Jul 18 2018
20ef7944a410	Gennadiy Civil/GitHub	Merge pull request #1667 from hckr/patch-1	Jul 18 2018
2211061e64d7	Gennadiy Civil/GitHub	Merge pull request #1670 from gennadiycivil/master	Jul 18 2018
234958def514	Masaru Tsuchiyama/GitHub	Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp	Jul 18 2018
4abbb774c39c	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jul 17 2018
5437926b2213	Gennadiy Civil	Docs sync	Jul 17 2018
a091b7533253	Syohei YOSHIDA	Ignore .DS_Store file	Jul 17 2018
65a49a73f0e7	duxiuxing	Fix warning C4819: The file contains a character that cannot be represented in…	Jul 17 2018
021c308069cc	Jakub Młokosiewicz/GitHub	Fix broken links to FAQ in primer.md	Jul 17 2018
077ee54cefd2	Gennadiy Civil/GitHub	Merge pull request #1655 from AdrianMoranMontes/master	Jul 16 2018
ee3885fbd6ef	Adrian Moran/GitHub	Merge branch 'master' into master	Jul 13 2018

Changes (116)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			.gitignore
	M			.travis.yml
	M			BUILD.bazel
	M			README.md
	M			appveyor.yml
	M			googlemock/README.md
	M			googlemock/docs/CheatSheet.md
	M			googlemock/docs/CookBook.md
	M			googlemock/docs/ForDummies.md
	M			googlemock/docs/FrequentlyAskedQuestions.md
	M			googlemock/include/gmock/gmock-actions.h
	M			googlemock/include/gmock/gmock-cardinalities.h
	M			googlemock/include/gmock/gmock-generated-actions.h
	M			googlemock/include/gmock/gmock-generated-actions.h.pump
	M			googlemock/include/gmock/gmock-generated-function-mockers.h
	M			googlemock/include/gmock/gmock-generated-function-mockers.h.pump
	M			googlemock/include/gmock/gmock-generated-matchers.h
	M			googlemock/include/gmock/gmock-generated-matchers.h.pump
	M			googlemock/include/gmock/gmock-generated-nice-strict.h
	M			googlemock/include/gmock/gmock-generated-nice-strict.h.pump
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-more-actions.h
	M			googlemock/include/gmock/gmock-more-matchers.h
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/gmock.h
	M			googlemock/include/gmock/internal/custom/gmock-generated-actions.h
	M			googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
	M			googlemock/include/gmock/internal/custom/gmock-matchers.h
	M			googlemock/include/gmock/internal/custom/gmock-port.h
	M			googlemock/include/gmock/internal/gmock-generated-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
	M			googlemock/include/gmock/internal/gmock-internal-utils.h
	M			googlemock/include/gmock/internal/gmock-port.h
	M			googlemock/scripts/generator/README
	M			googlemock/scripts/upload.py
	M			googlemock/src/gmock_main.cc
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock_ex_test.cc
	M			googlemock/test/gmock_leak_test.py
	M			googlemock/test/gmock_link2_test.cc
	M			googlemock/test/gmock_link_test.cc
	M			googlemock/test/gmock_output_test.py
	M			googlemock/test/gmock_stress_test.cc
	M			googlemock/test/gmock_test_utils.py
	M			googletest/CMakeLists.txt
	M			googletest/README.md
	M			googletest/cmake/internal_utils.cmake
	D			googletest/docs/AdvancedGuide.md
	D			googletest/docs/Documentation.md
	D			googletest/docs/FAQ.md
	D			googletest/docs/Primer.md
	D			googletest/docs/Samples.md
	M			googletest/docs/XcodeGuide.md
	A			googletest/docs/advanced.md
	A			googletest/docs/faq.md
	A			googletest/docs/primer.md
	A			googletest/docs/samples.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-spi.h
	M			googletest/include/gtest/gtest-test-part.h
	M			googletest/include/gtest/gtest-typed-test.h
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/gtest_pred_impl.h
	M			googletest/include/gtest/gtest_prod.h
	M			googletest/include/gtest/internal/custom/gtest-port.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-linked_ptr.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-arch.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/include/gtest/internal/gtest-string.h
	M			googletest/include/gtest/internal/gtest-tuple.h
	M			googletest/include/gtest/internal/gtest-tuple.h.pump
	M			googletest/include/gtest/internal/gtest-type-util.h
	M			googletest/include/gtest/internal/gtest-type-util.h.pump
	M			googletest/scripts/fuse_gtest_files.py
	M			googletest/scripts/upload.py
	M			googletest/src/gtest-all.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-printers.cc
	M			googletest/src/gtest-test-part.cc
	M			googletest/src/gtest.cc
	P			googletest/src/gtest_main.cc Copied to googletest/test/gtest_testbridge_test_.cc
	M			googletest/test/BUILD.bazel
	M			googletest/test/gtest-death-test_test.cc
	M			googletest/test/gtest-listener_test.cc
	M			googletest/test/gtest-param-test_test.h
	M			googletest/test/gtest-printers_test.cc
	M			googletest/test/gtest-unittest-api_test.cc
	M			googletest/test/gtest_all_test.cc
	M			googletest/test/gtest_help_test.py
	M			googletest/test/gtest_output_test.py
	M			googletest/test/gtest_output_test_golden_lin.txt
	M			googletest/test/gtest_prod_test.cc
	A			googletest/test/gtest_test_macro_stack_footprint_test.cc
	M			googletest/test/gtest_test_utils.py
	A			googletest/test/gtest_testbridge_test.py
	P			googletest/test/gtest_testbridge_test_.cc Copied from googletest/src/gtest_main.cc
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_output_unittest.py
	M			googletest/xcode/Config/DebugProject.xcconfig
	M			googletest/xcode/Config/FrameworkTarget.xcconfig
	M			googletest/xcode/Config/General.xcconfig
	M			googletest/xcode/Config/ReleaseProject.xcconfig
	M			googletest/xcode/Config/StaticLibraryTarget.xcconfig