Diffusion sp4e-homework-lars-bertil 773cc7876532

Merge branch 'master' into master
773cc7876532
Actions

Authored by bryanzim <BryanZim@bazinnovations.com> on Dec 20 2017, 14:21.

Description

Merge branch 'master' into master

Details

Committed

GitHub <noreply@github.com>

Dec 20 2017, 14:21

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:a37eedc3c15e: Merge pull request #1248 from aninf-wo/hethi/issue-360-remove…
R9484:8cbda54f48bd: Merge branch 'master' into master

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:773cc7876532: Merge branch 'master' into master (authored by bryanzim <BryanZim@bazinnovations.com>).Dec 20 2017, 14:21

Merged Changes

Commit	Author	Details	Committed
a37eedc3c15e	Gennadiy Civil/GitHub	Merge pull request #1248 from aninf-wo/hethi/issue-360-remove…	Dec 19 2017
782384d11ff4	Gennadiy Civil/GitHub	Merge pull request #1212 from qzmfranklin/bazel	Dec 19 2017
a7fceb4a98a7	Gennadiy Civil/GitHub	Update gtest-param-test.h.pump	Dec 19 2017
8a48f0ed4e0f	Gennadiy Civil/GitHub	Update gtest-param-test.h.pump	Dec 19 2017
058b318bc703	Gennadiy Civil/GitHub	Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS	Dec 18 2017
a7bd3725f08f	Gennadiy Civil/GitHub	Merge branch 'master' into bazel	Dec 18 2017
55fca1937d82	Gennadiy Civil/GitHub	Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS	Dec 9 2017
c5cba7d17a92	Gennadiy Civil/GitHub	Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS	Dec 1 2017
49eb76df4718	Gennadiy Civil/GitHub	Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS	Nov 7 2017
ceee80c383d6	Herbert Thielen/GitHub	Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS	Oct 4 2017
98024ad20273	Herbert Thielen/GitHub	Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS	Sep 24 2017
c86fbd766b4d	Herbert Thielen/GitHub	Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS	Sep 8 2017
aa0b5458a1c3	Herbert Thielen	remove GTEST_HAS_PARAM_TESTS	Sep 4 2017
79cdf971fbf8	Gennadiy Civil/GitHub	Merge branch 'master' into bazel	Aug 23 2017
f52c95dae48b	Zhongming Qu/GitHub	Merge branch 'master' into bazel	Aug 19 2017
99d0ef39a667	Zhongming Qu	Also can build when included in source.	Aug 18 2017
9538687a89b4	Zhongming Qu	Remove trailing whitespaces in BUILD.bazel	Aug 18 2017

Changes (17)

				Path
	M			BUILD.bazel
	M			googletest/include/gtest/gtest-param-test.h
	M			googletest/include/gtest/gtest-param-test.h.pump
	M			googletest/include/gtest/gtest.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.h
	M			googletest/samples/sample7_unittest.cc
	M			googletest/src/gtest-internal-inl.h
	M			googletest/src/gtest.cc
	M			googletest/test/gtest-param-test2_test.cc
	M			googletest/test/gtest-param-test_test.cc
	M			googletest/test/gtest-param-test_test.h
	M			googletest/test/gtest_filter_unittest_.cc
	M			googletest/test/gtest_output_test_.cc
	M			googletest/test/gtest_repeat_test.cc