Diffusion sp4e-homework-lars-bertil ad0146bfe21e

Merge branch 'master' into win-libcxx
ad0146bfe21e
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Jan 23 2018, 18:32.

Description

Merge branch 'master' into win-libcxx

Details

Committed

GitHub <noreply@github.com>

Jan 23 2018, 18:32

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:3c5e064ca089: Merge pull request #1417 from gennadiycivil/master
R9484:20b53ad786eb: Merge branch 'master' into win-libcxx

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:ad0146bfe21e: Merge branch 'master' into win-libcxx (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jan 23 2018, 18:32

Merged Changes

Commit	Author	Details	Committed
3c5e064ca089	Gennadiy Civil/GitHub	Merge pull request #1417 from gennadiycivil/master	Jan 23 2018
58df5760569f	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 23 2018
6723b6c588e2	Gennadiy Civil	Merging, upstream http://cl/182836545	Jan 23 2018
bbb17ad0f78c	Gennadiy Civil	more code merge	Jan 22 2018
f1c87ad9f518	Gennadiy Civil	merges, cl/155419551 and other	Jan 22 2018
83fa0cb17dad	Gennadiy Civil/GitHub	Merge pull request #1415 from gennadiycivil/master	Jan 22 2018
9bc86661f86a	Gennadiy Civil	more merging	Jan 22 2018
a0435a54ce83	Gennadiy Civil	merging	Jan 22 2018
8d707dfe817d	Gennadiy Civil	code merge	Jan 22 2018
62ba5d91d0ce	Gennadiy Civil/GitHub	Merge pull request #1401 from eidosmontreal/support_xboxone	Jan 19 2018
1489dc8daad3	Gennadiy Civil/GitHub	Merge branch 'master' into support_xboxone	Jan 18 2018
ea8f6f0e6959	Gaspard Petit	Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest…	Jan 12 2018
33d73d42b42a	gpetit/Gaspard Petit	Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne	Jan 12 2018
7ebbf5983451	Gaspard Petit	Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest…	Jan 12 2018
569d713a39d5	gpetit/Gaspard Petit	Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne	Jan 12 2018
5d96565ccc4b	Gaspard Petit	Merge branch 'master' into support_xboxone	Jan 9 2018
8b491162f792	Gennadiy Civil/GitHub	Merge branch 'master' into support_xboxone	Sep 6 2017
a1c332cdbe89	Gennadiy Civil/GitHub	Merge branch 'master' into support_xboxone	Aug 25 2017
cb9165163ac0	Gennadiy Civil/GitHub	Merge branch 'master' into support_xboxone	Aug 17 2017
b082ad2b3168	Gennadiy Civil/GitHub	Merge branch 'master' into support_xboxone	Aug 17 2017
6219d60eb9b7	gpetit	Merge remote-tracking branch 'origin/master' into support_xboxone	Aug 14 2017
c113a7151d28	gpetit	Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne	Aug 14 2017

Changes (15)

				Path
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/internal/gtest-port-arch.h
	M			googletest/src/gtest.cc
	M			googletest/test/gtest_color_test.py
	M			googletest/test/gtest_filter_unittest.py
	M			googletest/test/gtest_output_test.py
	M			googletest/test/gtest_repeat_test.cc
	M			googletest/test/gtest_test_utils.py
	M			googletest/test/gtest_throw_on_failure_test.py
	M			googletest/test/gtest_uninitialized_test.py
	M			googletest/test/gtest_uninitialized_test_.cc
	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