Merge branch 'master' into ignore-ds-store
43163c19d5ab
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Jul 18 2018, 20:09.

Description

Merge branch 'master' into ignore-ds-store

Committed

GitHub <noreply@github.com>

Jul 18 2018, 20:09

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:43163c19d5ab: Merge branch 'master' into ignore-ds-store (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jul 18 2018, 20:09

Commit	Author	Details	Committed
4235fff7f4c3	Gennadiy Civil/GitHub	Merge pull request #1671 from gennadiycivil/master	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
4abbb774c39c	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jul 17 2018
5437926b2213	Gennadiy Civil	Docs sync	Jul 17 2018
021c308069cc	Jakub Młokosiewicz/GitHub	Fix broken links to FAQ in primer.md	Jul 17 2018

				Path
	M			googlemock/include/gmock/internal/custom/gmock-matchers.h
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock_ex_test.cc
	M			googletest/docs/advanced.md
	M			googletest/docs/faq.md
	M			googletest/docs/primer.md
	M			googletest/include/gtest/internal/gtest-port.h