Diffusion sp4e-homework-lars-bertil e9b05a4d6aa7

Merge branch 'master' into master
e9b05a4d6aa7
Actions

Authored by tisi1988 <tisi1988@gmail.com> on Aug 7 2018, 11:12.

Description

Merge branch 'master' into master

Details

Committed

GitHub <noreply@github.com>

Aug 7 2018, 11:12

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:25e1436b087a: Merge branch 'master' into master
R9484:28b71e444c41: Merge pull request #1700 from gennadiycivil/master

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:e9b05a4d6aa7: Merge branch 'master' into master (authored by tisi1988 <tisi1988@gmail.com>).Aug 7 2018, 11:12

Merged Changes

Commit	Author	Details	Committed
28b71e444c41	Gennadiy Civil/GitHub	Merge pull request #1700 from gennadiycivil/master	Aug 6 2018
24edf4e3bfc1	Gennadiy Civil	automatic code sync mgt, comment only	Aug 6 2018
c81a34905dac	Gennadiy Civil/GitHub	Merge pull request #1673 from ppaulweber/bug/gcc_8_1_1_build_error	Aug 6 2018
1da26a77c553	Philipp Paulweber	Printers test: fixed compilation bug, due to unnecessary parentheses in…	Aug 3 2018
e887b03e5a1f	Gennadiy Civil/GitHub	Merge pull request #1696 from gennadiycivil/master	Aug 3 2018
2a7077fa2428	Gennadiy Civil	one more fix	Aug 3 2018
b929d55704e4	Gennadiy Civil	cmake fixes	Aug 2 2018
0d29f9702df3	Gennadiy Civil	more fixes	Aug 2 2018
95c313e68541	Gennadiy Civil	add --no_stacktrace_support for json-output-unittest	Aug 2 2018
94f2c6faa74a	Gennadiy Civil	fixes tests	Aug 2 2018
677df883ece2	Gennadiy Civil	cmake test fixes	Aug 2 2018
b7244ff37c19	Gennadiy Civil	cmake fixes	Aug 2 2018
930f0f86e303	Gennadiy Civil	cmake tests changes	Aug 2 2018
f3511bf1c703	Gennadiy Civil	cleaning up and adding test changes to CMake	Aug 2 2018
bbc0ac9b1ad9	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Aug 1 2018
5b9b39ff21db	Gennadiy Civil	Corresponding CMake Changes	Aug 1 2018
8dea630e8856	Gennadiy Civil	various changes to tests	Aug 1 2018
421f527df32f	Gennadiy Civil	more test changes	Aug 1 2018
7001dff4fc23	Gennadiy Civil	adding googletest-json-output unitest	Aug 1 2018
09fc73dde963	Gennadiy Civil	more test changes	Aug 1 2018
96077bc9f37c	Gennadiy Civil	more tests changes	Aug 1 2018
b888e23fce40	Gennadiy Civil	googletest list tests unitest	Aug 1 2018
35aa4fe92455	Gennadiy Civil	gtest catch exceptions test and gtest shuffle test	Aug 1 2018
a28968d6982f	Gennadiy Civil	changes to googletest break on failure and googletest filter unittests	Aug 1 2018
e5e2ef7cd27c	Gennadiy Civil/GitHub	Merge pull request #1695 from gennadiycivil/master	Aug 1 2018
d75922ca1c74	Gennadiy Civil	changes for googletest env var test	Aug 1 2018
38486eb03e9f	Gennadiy Civil	googltest-color-test changes	Aug 1 2018
6324796be150	Gennadiy Civil	googletest-output-test changes	Aug 1 2018
16c65a476a12	Gennadiy Civil/GitHub	Merge branch 'master' into master	Aug 1 2018
572b07ff8d93	Gennadiy Civil/GitHub	Merge pull request #1685 from einsteinsfool/master	Aug 1 2018
e69a1a83402d	Gennadiy Civil	Merge branch 'master' of https://github.com/google/googletest	Aug 1 2018
539ee4bc5498	Gennadiy Civil	Formatting changes and upstreaming one test	Aug 1 2018
f978c651ed73	Gennadiy Civil/GitHub	Merge branch 'master' into master	Jul 30 2018
309e8a271e9a	Piotr Kąkol	Updated broken and outdated URLs	Jul 25 2018

Changes (106)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			.travis.yml
	M			googlemock/docs/ForDummies.md
	M			googlemock/docs/FrequentlyAskedQuestions.md
	M			googlemock/scripts/upload.py
	M			googlemock/src/gmock_main.cc
	M			googlemock/test/gmock-actions_test.cc
	M			googlemock/test/gmock_leak_test.py
	M			googlemock/test/gmock_output_test.py
	M			googletest/CMakeLists.txt
	M			googletest/Makefile.am
	M			googletest/cmake/internal_utils.cmake
	M			googletest/docs/XcodeGuide.md
	M			googletest/docs/advanced.md
	M			googletest/docs/faq.md
	M			googletest/docs/primer.md
	M			googletest/include/gtest/internal/gtest-port.h
	M			googletest/scripts/upload.py
	M			googletest/src/gtest-port.cc
	M			googletest/test/BUILD.bazel
	V			googletest/test/{googletest-break-on-failure-unittest.py ← gtest_break_on_failure_unittest.py}
	V			googletest/test/{googletest-break-on-failure-unittest_.cc ← gtest_break_on_failure_unittest_.cc}
	V			googletest/test/{googletest-catch-exceptions-test.py ← gtest_catch_exceptions_test.py}
	V			googletest/test/{googletest-catch-exceptions-test_.cc ← gtest_catch_exceptions_test_.cc}
	V			googletest/test/{googletest-color-test.py ← gtest_color_test.py}
	V			googletest/test/{googletest-color-test_.cc ← gtest_color_test_.cc}
	V			googletest/test/{googletest-death-test-test.cc ← gtest-death-test_test.cc}
	V			googletest/test/{googletest-death-test_ex_test.cc ← gtest-death-test_ex_test.cc}
	V			googletest/test/{googletest-env-var-test.py ← gtest_env_var_test.py}
	V			googletest/test/{googletest-env-var-test_.cc ← gtest_env_var_test_.cc}
	V			googletest/test/{googletest-filepath-test.cc ← gtest-filepath_test.cc}
	V			googletest/test/{googletest-filter-unittest.py ← gtest_filter_unittest.py}
	V			googletest/test/{googletest-filter-unittest_.cc ← gtest_filter_unittest_.cc}
	V			googletest/test/{googletest-json-outfiles-test.py ← gtest_json_outfiles_test.py}
	V			googletest/test/{googletest-json-output-unittest.py ← gtest_json_output_unittest.py}
	V			googletest/test/{googletest-linked-ptr-test.cc ← gtest-linked_ptr_test.cc}
	V			googletest/test/{googletest-list-tests-unittest.py ← gtest_list_tests_unittest.py}
	V			googletest/test/{googletest-list-tests-unittest_.cc ← gtest_list_tests_unittest_.cc}
	V			googletest/test/{googletest-listener-test.cc ← gtest-listener_test.cc}
	V			googletest/test/{googletest-message-test.cc ← gtest-message_test.cc}
	V			googletest/test/{googletest-options-test.cc ← gtest-options_test.cc}
	V			googletest/test/{googletest-output-test-golden-lin.txt ← gtest_output_test_golden_lin.txt}
	V			googletest/test/{googletest-output-test.py ← gtest_output_test.py}
	V			googletest/test/{googletest-output-test_.cc ← gtest_output_test_.cc}
	P			googletest/test/googletest-param-test-invalid-name1-test.py Copied from googletest/test/gtest_uninitialized_test.py
	P			googletest/test/googletest-param-test-invalid-name1-test_.cc Copied from googletest/src/gtest_main.cc
	P			googletest/test/googletest-param-test-invalid-name2-test.py Copied from googletest/test/gtest_uninitialized_test.py
	P			googletest/test/googletest-param-test-invalid-name2-test_.cc Copied from googletest/src/gtest_main.cc
	V			googletest/test/{googletest-param-test-test.cc ← gtest-param-test_test.cc}
	V			googletest/test/{googletest-param-test-test.h ← gtest-param-test_test.h}
	P			googletest/test/googletest-param-test2-test.cc Copied from googletest/test/gtest-param-test2_test.cc
	V			googletest/test/{googletest-port-test.cc ← gtest-port_test.cc}
	V			googletest/test/{googletest-printers-test.cc ← gtest-printers_test.cc}
	V			googletest/test/{googletest-shuffle-test.py ← gtest_shuffle_test.py}
	V			googletest/test/{googletest-shuffle-test_.cc ← gtest_shuffle_test_.cc}
	V			googletest/test/{googletest-test-part-test.cc ← gtest-test-part_test.cc}
	V			googletest/test/{googletest-test2_test.cc ← gtest-param-test2_test.cc}
	V			googletest/test/{googletest-throw-on-failure-test.py ← gtest_throw_on_failure_test.py}
	V			googletest/test/{googletest-throw-on-failure-test_.cc ← gtest_throw_on_failure_test_.cc}
	V			googletest/test/{googletest-tuple-test.cc ← gtest-tuple_test.cc}
	V			googletest/test/{googletest-uninitialized-test.py ← gtest_uninitialized_test.py}
	V			googletest/test/{googletest-uninitialized-test_.cc ← gtest_uninitialized_test_.cc}
	V			googletest/test/{gtest-death-test_ex_test.cc → googletest-death-test_ex_test.cc}
	V			googletest/test/{gtest-death-test_test.cc → googletest-death-test-test.cc}
	V			googletest/test/{gtest-filepath_test.cc → googletest-filepath-test.cc}
	V			googletest/test/{gtest-linked_ptr_test.cc → googletest-linked-ptr-test.cc}
	V			googletest/test/{gtest-listener_test.cc → googletest-listener-test.cc}
	V			googletest/test/{gtest-message_test.cc → googletest-message-test.cc}
	V			googletest/test/{gtest-options_test.cc → googletest-options-test.cc}
	P			googletest/test/gtest-param-test2_test.cc Deleted after being copied to multiple locations: googletest/test/googletest-param-test2-test.cc googletest/test/googletest-test2_test.cc
	V			googletest/test/{gtest-param-test_test.cc → googletest-param-test-test.cc}
	V			googletest/test/{gtest-param-test_test.h → googletest-param-test-test.h}
	V			googletest/test/{gtest-port_test.cc → googletest-port-test.cc}
	V			googletest/test/{gtest-printers_test.cc → googletest-printers-test.cc}
	V			googletest/test/{gtest-test-part_test.cc → googletest-test-part-test.cc}
	V			googletest/test/{gtest-tuple_test.cc → googletest-tuple-test.cc}
	M			googletest/test/gtest_all_test.cc
	V			googletest/test/{gtest_break_on_failure_unittest.py → googletest-break-on-failure-unittest.py}
	V			googletest/test/{gtest_break_on_failure_unittest_.cc → googletest-break-on-failure-unittest_.cc}
	V			googletest/test/{gtest_catch_exceptions_test.py → googletest-catch-exceptions-test.py}
	V			googletest/test/{gtest_catch_exceptions_test_.cc → googletest-catch-exceptions-test_.cc}
	V			googletest/test/{gtest_color_test.py → googletest-color-test.py}
	V			googletest/test/{gtest_color_test_.cc → googletest-color-test_.cc}
	V			googletest/test/{gtest_env_var_test.py → googletest-env-var-test.py}
	V			googletest/test/{gtest_env_var_test_.cc → googletest-env-var-test_.cc}
	V			googletest/test/{gtest_filter_unittest.py → googletest-filter-unittest.py}
	V			googletest/test/{gtest_filter_unittest_.cc → googletest-filter-unittest_.cc}
	V			googletest/test/{gtest_json_outfiles_test.py → googletest-json-outfiles-test.py}
	V			googletest/test/{gtest_json_output_unittest.py → googletest-json-output-unittest.py}
	V			googletest/test/{gtest_list_tests_unittest.py → googletest-list-tests-unittest.py}
	V			googletest/test/{gtest_list_tests_unittest_.cc → googletest-list-tests-unittest_.cc}
	V			googletest/test/{gtest_output_test.py → googletest-output-test.py}
	V			googletest/test/{gtest_output_test_.cc → googletest-output-test_.cc}
	V			googletest/test/{gtest_output_test_golden_lin.txt → googletest-output-test-golden-lin.txt}
	V			googletest/test/{gtest_shuffle_test.py → googletest-shuffle-test.py}
	V			googletest/test/{gtest_shuffle_test_.cc → googletest-shuffle-test_.cc}
	A			googletest/test/gtest_test_macro_stack_footprint_test.cc
	V			googletest/test/{gtest_throw_on_failure_test.py → googletest-throw-on-failure-test.py}
	V			googletest/test/{gtest_throw_on_failure_test_.cc → googletest-throw-on-failure-test_.cc}
	P			googletest/test/gtest_uninitialized_test.py Deleted after being copied to multiple locations: googletest/test/googletest-param-test-invalid-name1-test.py googletest/test/googletest-param-test-invalid-name2-test.py googletest/test/googletest-uninitialized-test.py
	V			googletest/test/{gtest_uninitialized_test_.cc → googletest-uninitialized-test_.cc}
	M			googletest/test/gtest_unittest.cc
	M			googletest/xcode/Config/DebugProject.xcconfig
	M			googletest/xcode/Config/FrameworkTarget.xcconfig
	M			googletest/xcode/Config/General.xcconfig
	M			googletest/xcode/Config/ReleaseProject.xcconfig
	M			googletest/xcode/Config/StaticLibraryTarget.xcconfig