Diffusion sp4e-homework-lars-bertil 0ffa5f9779fc

Merge branch 'master' into chore/fix_library_json
0ffa5f9779fc
Actions

Authored by Chris Johnson <chrisjohnsonmail@gmail.com> on Jan 4 2019, 04:13.

Description

Merge branch 'master' into chore/fix_library_json

Details

Committed

GitHub <noreply@github.com>

Jan 4 2019, 04:13

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:0c0ca9038245: fix: Correct *_main.cc paths
R9484:3880b13e4c0b: Merge pull request #2042 from gennadiycivil/master

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:0ffa5f9779fc: Merge branch 'master' into chore/fix_library_json (authored by Chris Johnson <chrisjohnsonmail@gmail.com>).Jan 4 2019, 04:13

Merged Changes

Commit	Author	Details	Committed
3880b13e4c0b	Gennadiy Civil/GitHub	Merge pull request #2042 from gennadiycivil/master	Jan 4 2019
58e62f7a989c	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 3 2019
5d3a2cd9c854	Gennadiy Civil	Update docs, TestCase->TestSuite	Jan 3 2019
827515f8a092	misterg/Gennadiy Civil	Googletest export	Jan 3 2019
3a460a26b7a9	misterg/Gennadiy Civil	Googletest export	Jan 3 2019
ac8c102dae66	Gennadiy Civil/GitHub	Update README.md	Jan 3 2019
6e410a3ae965	Gennadiy Civil/GitHub	Update README.md	Jan 3 2019
8a27d164cbc7	Gennadiy Civil/GitHub	Update README.md	Jan 3 2019
bfcc47fc2f61	Gennadiy Civil/GitHub	Merge pull request #2026 from justin6case/example_makefile_improvements	Jan 3 2019
1bcbd5871e34	Gennadiy Civil	Merge pull request #2037 from ciband:chore/fix_library_json	Jan 3 2019
14c2fba7349e	misterg/Gennadiy Civil	Googletest export	Jan 2 2019
f8b1c1af1775	Abseil Team/Gennadiy Civil	Googletest export	Jan 2 2019
933e5df28372	Gennadiy Civil/GitHub	Merge pull request #2039 from gennadiycivil/master	Jan 2 2019
8ed34e0f6b4e	Gennadiy Civil	Remove outdated scripts	Jan 2 2019
2ace910a3580	Gennadiy Civil	Revert "test, please ignore"	Jan 2 2019
25905b9f9a45	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 2 2019
3bedb5a9fc36	Gennadiy Civil/GitHub	Merge pull request #2035 from syohex/update-xcode-project-file	Dec 28 2018
0cf2130c0b59	Syohei YOSHIDA	Update Xcode project file	Dec 28 2018
6729a1361150	Ryohei Machida/Gennadiy Civil	Merge #2002	Dec 27 2018
77004096e850	Gennadiy Civil/GitHub	Update README.md	Dec 27 2018
16269ae2f857	Gennadiy Civil	Merge pull request #2027 from ciband:chore/fix_library_json	Dec 27 2018
150613166524	Gennadiy Civil/GitHub	Update README.md	Dec 21 2018
4160336cb433	Gennadiy Civil	Merge pull request #2013 from ciband:chore/fix_library_json	Dec 21 2018
34a99e547ab7	Abseil Team/Gennadiy Civil	Googletest export	Dec 21 2018
b93a13ec4db4	Case, Matt	Improvements have been made to the example/sample makefiles for both googlemock…	Dec 21 2018
a83cc11abe48	Abseil Team/Mark Barolak	Googletest export	Dec 20 2018
9494c45e75a5	Abseil Team/Mark Barolak	Googletest export	Dec 20 2018
e26a3fa13ca2	Abseil Team/Mark Barolak	Googletest export	Dec 20 2018
9ab640ce5e51	misterg/Gennadiy Civil	Googletest export	Dec 17 2018
7515e399436a	misterg/Gennadiy Civil	Googletest export	Dec 17 2018
85c4172ed66e	Gennadiy Civil/GitHub	Update README.md	Dec 17 2018
ed3f9bb22960	misterg/Mark Barolak	Googletest export	Dec 17 2018
b7dd66519f4a	Abseil Team/Mark Barolak	Googletest export	Dec 17 2018
1ec20f87e390	Abseil Team/Mark Barolak	Googletest export	Dec 17 2018
096fb37a1976	Abseil Team/Mark Barolak	Googletest export	Dec 17 2018
4665eee10a1d	Gennadiy Civil	test, please ignore	Oct 9 2018

Changes (75)

				Path
	M			README.md
	M			googlemock/Makefile.am
	M			googlemock/include/gmock/gmock-actions.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
	D			googlemock/include/gmock/gmock-generated-nice-strict.h
	V			googlemock/include/gmock/{gmock-generated-nice-strict.h.pump → gmock-nice-strict.h}
	M			googlemock/include/gmock/gmock-matchers.h
	V			googlemock/include/gmock/{gmock-nice-strict.h ← gmock-generated-nice-strict.h.pump}
	M			googlemock/include/gmock/gmock-spec-builders.h
	M			googlemock/include/gmock/gmock.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/make/Makefile
	M			googlemock/src/gmock-internal-utils.cc
	M			googlemock/src/gmock-spec-builders.cc
	M			googlemock/src/gmock.cc
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock-function-mocker_test.cc
	M			googlemock/test/gmock-generated-actions_test.cc
	M			googlemock/test/gmock-generated-function-mockers_test.cc
	M			googlemock/test/gmock-generated-matchers_test.cc
	M			googlemock/test/gmock-internal-utils_test.cc
	M			googlemock/test/gmock-matchers_test.cc
	M			googlemock/test/gmock-nice-strict_test.cc
	M			googletest/docs/advanced.md
	M			googletest/docs/faq.md
	M			googletest/docs/primer.md
	M			googletest/include/gtest/gtest-death-test.h
	M			googletest/include/gtest/gtest-matchers.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/gtest_pred_impl.h
	M			googletest/include/gtest/internal/gtest-internal.h
	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-type-util.h
	M			googletest/include/gtest/internal/gtest-type-util.h.pump
	M			googletest/make/Makefile
	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-printers.cc
	M			googletest/src/gtest-typed-test.cc
	M			googletest/src/gtest.cc
	M			googletest/test/BUILD.bazel
	M			googletest/test/googletest-catch-exceptions-test.py
	M			googletest/test/googletest-death-test-test.cc
	M			googletest/test/googletest-filepath-test.cc
	M			googletest/test/googletest-json-outfiles-test.py
	M			googletest/test/googletest-listener-test.cc
	M			googletest/test/googletest-options-test.cc
	M			googletest/test/googletest-output-test-golden-lin.txt
	M			googletest/test/googletest-output-test.py
	M			googletest/test/googletest-output-test_.cc
	M			googletest/test/googletest-printers-test.cc
	M			googletest/test/googletest-test-part-test.cc
	M			googletest/test/googletest-throw-on-failure-test.py
	M			googletest/test/gtest-typed-test_test.cc
	M			googletest/test/gtest_assert_by_exception_test.cc
	M			googletest/test/gtest_pred_impl_unittest.cc
	M			googletest/test/gtest_repeat_test.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_unittest.cc
	M			googletest/test/gtest_xml_outfiles_test.py
	M			library.json