Diffusion sp4e-homework-lars-bertil 1489dc8daad3

Merge branch 'master' into support_xboxone
1489dc8daad3
Actions

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

Description

Merge branch 'master' into support_xboxone

Details

Committed

GitHub <noreply@github.com>

Jan 18 2018, 23:42

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:051053054df6: Merge pull request #1412 from gennadiycivil/master
R9484:ea8f6f0e6959: Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest…

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:1489dc8daad3: Merge branch 'master' into support_xboxone (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jan 18 2018, 23:42

Merged Changes

Commit	Author	Details	Committed
051053054df6	Gennadiy Civil/GitHub	Merge pull request #1412 from gennadiycivil/master	Jan 18 2018
b1623e914474	Gennadiy Civil	Adding python tests to Bazel build file.	Jan 18 2018
8d733dc19525	Gennadiy Civil/GitHub	Merge pull request #1407 from ted-xp/master	Jan 18 2018
8e862211a248	Fedor Trushkin	Use fully qualified in examples	Jan 18 2018
354fc8d8b188	Fedor Trushkin	Document ScopedTrace utility	Jan 18 2018
9c82e7745c25	Fedor Trushkin	Expose ScopedTrace utility in public interface	Jan 17 2018
1b077667bd95	Gennadiy Civil/GitHub	Merge pull request #1402 from gennadiycivil/master	Jan 16 2018
08b323f717ea	Gennadiy Civil	Reverting some changes, need to make the merge compile	Jan 16 2018
9195571c6952	Gennadiy Civil	Reverting some changes, need to make the merge compile	Jan 15 2018
6d04de7419a7	Gennadiy Civil	Reverting some changes, need to make the merge compile	Jan 15 2018
b9e297838daa	Gennadiy Civil	Reverting some changes, need to make the merge compile	Jan 15 2018
304be8f009d0	Gennadiy Civil	Test files for corresponding changes	Jan 15 2018
6befe422f2ce	Gennadiy Civil	Test files for corresponding changes	Jan 15 2018
f45c22c48249	Gennadiy Civil	Test files for corresponding changes	Jan 15 2018
5f4ce9d88475	Gennadiy Civil	Test files for corresponding changes	Jan 15 2018
26085d7675bc	Gennadiy Civil	Merge branch 'master' of github.com:gennadiycivil/googletest	Jan 15 2018
d629744ec0e0	Gennadiy Civil	More code merges	Jan 15 2018
6c8659880577	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 15 2018
822c6201d3ba	Gennadiy Civil/GitHub	Merge branch 'master' into master	Jan 15 2018
da1f7fe1e7a5	Gennadiy Civil	Code merging	Jan 15 2018
051fe2fa05af	Gennadiy Civil/GitHub	Merge pull request #1339 from Romain-Geissler/fix-core-dump-shared	Jan 15 2018
f6887b5cb905	Gennadiy Civil/GitHub	Merge branch 'master' into fix-core-dump-shared	Jan 13 2018
63ded6c27ac2	Gennadiy Civil/GitHub	Merge pull request #1400 from gennadiycivil/master	Jan 13 2018
93b77987f599	Gennadiy Civil	continue upstream/merge, etc	Jan 11 2018
717d784ab2f9	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Jan 11 2018
2982dc1a5800	Gennadiy Civil	Trying to fix travis	Jan 11 2018
0e6da4cead72	Gennadiy Civil/GitHub	Merge branch 'master' into fix-core-dump-shared	Jan 9 2018
cdedd189b22a	Gennadiy Civil/GitHub	Merge branch 'master' into fix-core-dump-shared	Dec 8 2017
0663ce9024c9	Romain Geissler	Fix double free when building Gtest/GMock in shared libraries and linking a…	Dec 2 2017

Changes (10)

				Path
	M			googlemock/CMakeLists.txt
	M			googletest/docs/AdvancedGuide.md
	M			googletest/include/gtest/gtest.h
	M			googletest/include/gtest/gtest_pred_impl.h
	M			googletest/include/gtest/internal/gtest-internal.h
	M			googletest/src/gtest.cc
	M			googletest/test/BUILD.bazel
	M			googletest/test/gtest_output_test.py
	M			googletest/test/gtest_output_test_.cc
	M			googletest/test/gtest_output_test_golden_lin.txt