Diffusion sp4e-homework-lars-bertil c955e3349796

Merge branch 'master' into python3-tests
c955e3349796
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Oct 19 2018, 22:30.

Description

Merge branch 'master' into python3-tests

Details

Committed

GitHub <noreply@github.com>

Oct 19 2018, 22:30

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:3149e0e88bf0: Merge branch 'master' into python3-tests
R9484:f410177a8b54: Update .travis.yml

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:c955e3349796: Merge branch 'master' into python3-tests (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Oct 19 2018, 22:30

Merged Changes

Commit	Author	Details	Committed
f410177a8b54	Gennadiy Civil/GitHub	Update .travis.yml	Oct 19 2018
723f26663f15	Gennadiy Civil/GitHub	Update .travis.yml	Oct 18 2018
663ef8636a62	misterg/Gennadiy Civil	Googletest export	Oct 18 2018
3a7f0934d695	Gennadiy Civil	Merge pull request #1912 from kakkoko:fix-xml-name	Oct 18 2018
29b47e45cfd0	Abseil Team/Gennadiy Civil	Googletest export	Oct 18 2018
baf6845b1847	kakkoko	Fix incorrect XML file name in help message	Oct 17 2018
a651a4d44e65	Gennadiy Civil	Merge pull request #1908 from rwoldberg:master	Oct 12 2018
dec3b81a08f8	Robert Woldberg	Change types to remove cast warnings.	Oct 12 2018
864b6c2d35db	misterg/Gennadiy Civil	Remove duplicate functionality PrintValue (in googletest-param-test-test.cc)…	Oct 11 2018
b3b19a796cbb	KO Myung-Hun/Gennadiy Civil	Merge c41b2bf861ef2ac1a975af05ff66d9256f280b01 into…	Oct 11 2018
f203b2db7716	Gennadiy Civil/GitHub	Merge pull request #1902 from theryee/typo	Oct 11 2018
ad997b16b5f9	David Neto/Gennadiy Civil	Merge 4c92120d6dedb4eeb499a8702faea0224e0a8b23 into…	Oct 11 2018
e7327c13f6f2	Aaron Dierking/Gennadiy Civil	Merge 41fc9745d4a448db7d932250d22fac1dda287443 into…	Oct 11 2018
bc6a4ce38086	Abseil Team/Gennadiy Civil	Project import generated by Copybara.	Oct 11 2018
0e71eb069a79	misterg/Gennadiy Civil	Internal Change	Oct 11 2018
4d50ab75a730	Ryan Yee/GitHub	Merge branch 'master' into typo	Oct 11 2018
a83429f5d31a	Ryan Yee	fix typo	Oct 11 2018
658c6390a5b3	Gennadiy Civil/GitHub	Merge pull request #1898 from spartucus/master	Oct 10 2018
8193ed069c09	Tengfei Niu/GitHub	Update .gitignore	Oct 10 2018
78761b58fc9a	misterg/Gennadiy Civil	Remove non-variadic pre C++11 AnyOf	Oct 9 2018
7d3b73c85a42	Abseil Team/Gennadiy Civil	Unconditionally use std::tuple. Remove all mention of TR1 tuple and our own…	Oct 9 2018
5434989dbd8a	misterg/Gennadiy Civil	Remove testing::internal::BothOfMatcher, no longer needed	Oct 9 2018
b652edb39c7e	Abseil Team/Gennadiy Civil	Apply [[noreturn]] to Abort()	Oct 9 2018
7a1e9114a475	Gennadiy Civil/GitHub	Update Makefile.am	Oct 9 2018
689ac9fbd013	Gennadiy Civil/GitHub	Update BUILD.bazel	Oct 9 2018
5ae4f6222584	Gennadiy Civil/GitHub	Update README.md	Oct 9 2018
272c08380af5	Gennadiy Civil/GitHub	Delete CHANGES	Oct 9 2018
ac7ed4046c35	Gennadiy Civil/GitHub	Delete CHANGES	Oct 9 2018
a31d6f9057f6	Eisoku Kuroiwa/Gennadiy Civil	Merge c1170881039e859738c62b02a918116fc6d346bc into…	Oct 8 2018
4ac07de8de54	misterg/Gennadiy Civil	Fixing AllOfMatches test, where it properly belongs	Oct 8 2018
27c86f29417e	misterg/Gennadiy Civil	always define define GTEST_LANG_CXX11 1	Oct 8 2018
fab35920ad7e	misterg/Gennadiy Civil	Remove non-variadic pre C++11 AllOf	Oct 8 2018

Changes (52)

				Path
	M			.gitignore
	M			CMakeLists.txt
	M			README.md
	M			ci/env-osx.sh
	D			googlemock/CHANGES
	M			googlemock/CMakeLists.txt
	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
	M			googlemock/include/gmock/gmock-generated-matchers.h
	M			googlemock/include/gmock/gmock-generated-matchers.h.pump
	M			googlemock/include/gmock/gmock-matchers.h
	M			googlemock/include/gmock/gmock-more-actions.h
	M			googlemock/include/gmock/gmock-spec-builders.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/test/gmock-actions_test.cc
	M			googlemock/test/gmock-generated-actions_test.cc
	M			googlemock/test/gmock-generated-internal-utils_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-more-actions_test.cc
	D			googletest/CHANGES
	M			googletest/CMakeLists.txt
	M			googletest/Makefile.am
	M			googletest/cmake/internal_utils.cmake
	P			googletest/include/gtest/gtest-param-test.h Copied from googletest/include/gtest/gtest-param-test.h.pump
	P			googletest/include/gtest/gtest-param-test.h.pump Copied to googletest/include/gtest/gtest-param-test.h
	M			googletest/include/gtest/gtest-printers.h
	M			googletest/include/gtest/internal/gtest-param-util-generated.h
	M			googletest/include/gtest/internal/gtest-param-util-generated.h.pump
	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
	D			googletest/include/gtest/internal/gtest-tuple.h
	D			googletest/include/gtest/internal/gtest-tuple.h.pump
	M			googletest/include/gtest/internal/gtest-type-util.h.pump
	M			googletest/samples/sample8_unittest.cc
	M			googletest/src/gtest-port.cc
	M			googletest/src/gtest-printers.cc
	M			googletest/src/gtest.cc
	M			googletest/test/BUILD.bazel
	M			googletest/test/googletest-filepath-test.cc
	M			googletest/test/googletest-options-test.cc
	M			googletest/test/googletest-param-test-test.cc
	M			googletest/test/googletest-printers-test.cc
	D			googletest/test/googletest-tuple-test.cc
	M			googletest/test/gtest_test_utils.py