Diffusion sp4e-homework-lars-bertil 2421eff9f780

Merge branch 'master' into deprecate
2421eff9f780
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Aug 14 2018, 17:47.

Description

Merge branch 'master' into deprecate

Details

Committed

GitHub <noreply@github.com>

Aug 14 2018, 17:47

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:17714d65e158: Merge pull request #1738 from gennadiycivil/master
R9484:24786cb49823: Merge branch 'master' into deprecate

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:2421eff9f780: Merge branch 'master' into deprecate (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Aug 14 2018, 17:47

Merged Changes

Commit	Author	Details	Committed
17714d65e158	Gennadiy Civil/GitHub	Merge pull request #1738 from gennadiycivil/master	Aug 14 2018
f225735222b5	Gennadiy Civil	Code formatting changes, clean up, no functionality changes	Aug 14 2018
15ef6ec064d8	Gennadiy Civil/GitHub	Merge pull request #1733 from gennadiycivil/master	Aug 14 2018
caeaef302d76	Gennadiy Civil/GitHub	Merge branch 'master' into master	Aug 14 2018
c203bee2457e	Gennadiy Civil	formatting custom/README.md	Aug 14 2018
9060e19c87d6	Gennadiy Civil	formatting for new READMEs	Aug 13 2018
8bc11c040a1d	Gennadiy Civil/GitHub	Merge pull request #924 from wind-river-cdt/cross-testing-patch-1	Aug 13 2018
47b57ff1b2f4	Gennadiy Civil/GitHub	Merge branch 'master' into cross-testing-patch-1	Aug 13 2018
44fb2a1edd62	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Aug 13 2018
63baab8924f5	Gennadiy Civil	Move instructions into custom/README files	Aug 13 2018
7800ba3eeade	Gennadiy Civil/GitHub	Merge pull request #1732 from gennadiycivil/master	Aug 13 2018
18c940d13a58	Gennadiy Civil	comment cleanup	Aug 13 2018
65b42fa6152c	Gennadiy Civil/GitHub	Merge pull request #1731 from 2power10/master	Aug 13 2018
ecc241900a1e	Yi Zheng/Yi Zheng	- Fix the broken markdown table - Fix some format issue	Aug 13 2018
ae94a9097d76	Gennadiy Civil/GitHub	Merge pull request #1727 from gennadiycivil/master	Aug 10 2018
390a6b793217	Gennadiy Civil	Mode change on a python script	Aug 10 2018
8cccb2a718c3	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018
9cb381952ecf	Gennadiy Civil/GitHub	Merge pull request #1726 from google/gennadiycivil-patch-2	Aug 10 2018
b1236528fef2	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018
77ac31c35f15	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018
4de527dc2cc2	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018
945618b2025b	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018
e821a2db235e	Gennadiy Civil/GitHub	Update README.md	Aug 10 2018
6b6be9457bce	Gennadiy Civil/GitHub	Merge pull request #1725 from google/gennadiycivil-patch-1	Aug 9 2018
5eb263569bc1	Gennadiy Civil/GitHub	Update gmock_output_test.py	Aug 9 2018
b46b86ee6075	Gennadiy Civil/GitHub	Merge pull request #1719 from happyCoder92/master	Aug 9 2018
6b89cb06a71f	Gennadiy Civil/GitHub	Merge pull request #1724 from gennadiycivil/master	Aug 9 2018
4e13415ff445	Gennadiy Civil/GitHub	Merge branch 'master' into master	Aug 9 2018
640556f9e596	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Aug 9 2018
acaf5beaccf6	Gennadiy Civil	formatting and small changes related to code management, no functionality…	Aug 9 2018
4843eafd9e86	Gennadiy Civil/GitHub	Merge pull request #1723 from gennadiycivil/master	Aug 9 2018
71c2bb4a97c6	Gennadiy Civil/GitHub	Merge branch 'master' into master	Aug 9 2018
4d9411467daf	Gennadiy Civil	code management comments, [ci-skip], no functionality changes	Aug 9 2018
33596cb5c3cd	Gennadiy Civil/GitHub	Merge pull request #1721 from gennadiycivil/master	Aug 9 2018
7a79459a663c	Gennadiy Civil	Fixing identation, causes build errors when warnings are treated as errors	Aug 9 2018
54cb8b02387a	Gennadiy Civil	Merge branch 'master' of github.com:gennadiycivil/googletest	Aug 9 2018
f7042937af1b	Gennadiy Civil	Fixing identation, causes build errors when warnings are treated as errors	Aug 9 2018
d5b31df90080	Gennadiy Civil/GitHub	Update gtest-death-test.cc	Aug 9 2018
9faeadedf401	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Aug 9 2018
ecc6944fb127	Gennadiy Civil	Fixing identation, causes build errors when warnings are treated as errors	Aug 9 2018
2797ba8f917b	Gennadiy Civil/GitHub	Merge pull request #1720 from gennadiycivil/master	Aug 9 2018
3d167fde424c	Gennadiy Civil	Merge branch 'master' of github.com:gennadiycivil/googletest	Aug 9 2018
063a90b391d4	Gennadiy Civil	Formatting change for auto code management, no functionality changes	Aug 9 2018
db43df6df733	Wiktor Garbacz	docs: fix broken links	Aug 9 2018
11f5a2740aa8	Gennadiy Civil/GitHub	Merge branch 'master' into cross-testing-patch-1	Aug 8 2018
008e54c1dd40	Martin Oberhuber/GitHub	Fix #923 - support CMAKE_CROSSCOMPILING_EMULATOR for tests	Nov 5 2016

Changes (21)

				Path
	M			README.md
	M			googlemock/include/gmock/gmock-generated-actions.h
	M			googlemock/include/gmock/gmock-generated-actions.h.pump
	A			googlemock/include/gmock/internal/custom/README.md
	M			googlemock/include/gmock/internal/custom/gmock-matchers.h
	M			googlemock/include/gmock/internal/custom/gmock-port.h
	M			googlemock/test/gmock_output_test.py
	M			googletest/cmake/internal_utils.cmake
	M			googletest/docs/advanced.md
	M			googletest/docs/faq.md
	A			googletest/include/gtest/internal/custom/README.md
	M			googletest/include/gtest/internal/custom/gtest-port.h
	M			googletest/include/gtest/internal/custom/gtest-printers.h
	M			googletest/include/gtest/internal/custom/gtest.h
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/src/gtest-death-test.cc
	M			googletest/src/gtest.cc
	M			googletest/test/googletest-output-test.py
	M			googletest/test/googletest-printers-test.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_testbridge_test.py