Diffusion sp4e-homework-lars-bertil a7bd3725f08f

Merge branch 'master' into bazel
a7bd3725f08f
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Dec 18 2017, 17:38.

Description

Merge branch 'master' into bazel

Details

Committed

GitHub <noreply@github.com>

Dec 18 2017, 17:38

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:79cdf971fbf8: Merge branch 'master' into bazel
R9484:1865ecaf1779: Merge pull request #1354 from coryan/fix-top-level-license

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:a7bd3725f08f: Merge branch 'master' into bazel (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Dec 18 2017, 17:38

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
1865ecaf1779	Gennadiy Civil/GitHub	Merge pull request #1354 from coryan/fix-top-level-license	Dec 15 2017
f34cbefe5098	Carlos O'Ryan	Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix…	Dec 12 2017
23a014ab5786	Carlos O'Ryan	Refactor docs about contributions to CONTRIBUTING.md.	Dec 12 2017
cb95f316c8f5	Gennadiy Civil/GitHub	Merge branch 'master' into fix-top-level-license	Dec 11 2017
0fe96607d85c	Gennadiy Civil/GitHub	Merge pull request #1355 from coryan/blaze-build-travis	Dec 11 2017
ed811dc79feb	Gennadiy Civil/GitHub	Merge branch 'master' into blaze-build-travis	Dec 11 2017
59202300f1a7	Gennadiy Civil/GitHub	Merge pull request #1333 from sam-lunt/use-system-includes	Dec 9 2017
c82cd5e41e37	Carlos O'Ryan	Also add documentation around becoming a contributor.	Dec 9 2017
11841175d802	Carlos O'Ryan	Wrong LICENSE file, sorry. Corrected. [skip ci]	Dec 9 2017
bc3320b7f1da	Carlos O'Ryan	Implement bazel-based builds in Travis.	Dec 9 2017
e22d344c51b4	Carlos O'Ryan	Add Apache-2.0 LICENSE file.	Dec 8 2017
10ef1d9a1e7e	Gennadiy Civil/GitHub	Merge branch 'master' into use-system-includes	Dec 8 2017
cc372a071bb4	Gennadiy Civil/GitHub	Merge pull request #1340 from coryan/fix-googlemock-test-build-file	Dec 8 2017
cf3adad594b6	Carlos O'Ryan/Carlos O'Ryan	Add licenses() directive for googlemock/tests.	Dec 8 2017
4d1f930af878	Gennadiy Civil/GitHub	Merge pull request #1345 from coryan/fix-travis-build-macOS	Dec 8 2017
efc6abae678f	Gennadiy Civil/GitHub	Merge branch 'master' into fix-travis-build-macOS	Dec 8 2017
887a6c642006	Gennadiy Civil/GitHub	Merge pull request #1348 from wmamrak/master	Dec 8 2017
57bb0bbbf80b	Wojciech Mamrak/GitHub	Remove C4996 warning in VS2017	Dec 7 2017
3464f76e890a	Wojciech Mamrak/GitHub	Improved description of VS std::tuple support	Dec 7 2017
8d9d6bb0a375	Wojciech Mamrak/GitHub	Improved description of VS std::tuple support	Dec 7 2017
4aa05bd4ffb8	Carlos O'Ryan/Carlos O'Ryan	Only switch to g++-4.9 on Linux.	Dec 7 2017
a868e618c060	Gennadiy Civil/GitHub	Merge pull request #1225 from brian-peloton/master	Dec 5 2017
9e236748fb7c	Gennadiy Civil/GitHub	Merge branch 'master' into master	Dec 1 2017
ce919c3ddf80	Gennadiy Civil/GitHub	Merge branch 'master' into use-system-includes	Dec 1 2017
247a3d8e5e5d	Gennadiy Civil/GitHub	Merge pull request #1324 from whame/master	Dec 1 2017
f46bd00e369e	Sam Lunt/Sam Lunt	make includes system	Nov 28 2017
82447f23be94	whame	Fixes issue #826 by treating MinGW as "non-Windows" when determining colored…	Nov 7 2017
d175c8bf823e	Gennadiy Civil/GitHub	Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312	Oct 30 2017
43d6ad75bc4f	Gennadiy Civil/GitHub	Merge pull request #1308 from KindDragon/vs2017-ci	Oct 30 2017
8866af0386d7	Herbert Thielen	remove markdown stars (bold) from code examples	Oct 29 2017
b153bfd8f503	Arkady Shapkin	Enable CI for VS2017	Oct 25 2017
3121b2049e30	Gennadiy Civil/GitHub	Merge pull request #1304 from m-gupta/gtestapifix	Oct 25 2017
e93a15c5a59e	Gennadiy Civil/GitHub	Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation…	Oct 25 2017
060783b7d2b7	m-gupta/GitHub	Merge branch 'master' into gtestapifix	Oct 25 2017
20e2de7d8bba	Romain Geissler	Remove gcc 6 misleading indentations.	Oct 25 2017
7684db32712e	Gennadiy Civil/GitHub	Merge pull request #1218 from KindDragon/vs-build-fix	Oct 25 2017
840c711e7bd7	Arkady Shapkin	Fix gmock tests when std::unary_function unavailable	Oct 25 2017
2641b021fc2a	Arkadiy Shapkin/Arkady Shapkin	Fix tests with VS2015 and VS2017	Oct 25 2017
77380cddf771	Arkadiy Shapkin/Arkady Shapkin	Enable C++11 features for VS2015 and VS2017	Oct 25 2017
6d0bb75c81bc	Gennadiy Civil/GitHub	Merge pull request #1139 from chehsunliu/master	Oct 24 2017
1beff241c359	Manoj Gupta	googletest: Add GTEST_API_ attribute to ThreadLocal class.	Oct 20 2017
c208d8df23d6	Gennadiy Civil/GitHub	Merge branch 'master' into master	Oct 20 2017
69e48e92de43	Gennadiy Civil/GitHub	Merge pull request #1300 from gennadiycivil/master	Oct 18 2017
48986f9d4c8e	Gennadiy Civil/GitHub	Merge branch 'master' into master	Oct 18 2017
54c2648bff0e	Gennadiy Civil	Workaround for Travis issue https://goo.gl/d5eV8o	Oct 18 2017
27be0dfb53a1	Gennadiy Civil/GitHub	Merge pull request #1298 from google/revert-1297-master	Oct 18 2017
34aaf58c8b1b	Gennadiy Civil/GitHub	Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…"	Oct 18 2017
5c9543547e5f	Gennadiy Civil/GitHub	Merge pull request #1297 from gennadiycivil/master	Oct 18 2017
dfed97a69ac3	Gennadiy Civil	Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552	Oct 18 2017
3282f9ae018f	Gennadiy Civil/GitHub	Merge pull request #1288 from joealam/master	Oct 16 2017

Changes (110)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		.gitignore
M		.travis.yml
A		CONTRIBUTING.md
A		LICENSE
M		README.md
M		appveyor.yml
A	(dir)	ci/
P		ci/build-linux-bazel.sh Copied from googlemock/test/BUILD.bazel
P		ci/env-linux.sh Copied from googlemock/test/BUILD.bazel
P		ci/env-osx.sh Copied from googlemock/test/BUILD.bazel
P		ci/install-linux.sh Copied from googlemock/test/BUILD.bazel
P		ci/install-osx.sh Copied from googlemock/test/BUILD.bazel
P		ci/log-config.sh Copied from googlemock/test/BUILD.bazel
A		ci/travis.sh
M		googlemock/CMakeLists.txt
M		googlemock/README.md
M		googlemock/configure.ac
M		googlemock/docs/CheatSheet.md
M		googlemock/docs/CookBook.md
D		googlemock/docs/DevGuide.md
M		googlemock/docs/Documentation.md
M		googlemock/docs/ForDummies.md
M		googlemock/docs/FrequentlyAskedQuestions.md
M		googlemock/include/gmock/gmock-generated-actions.h
M		googlemock/include/gmock/gmock-generated-actions.h.pump
M		googlemock/include/gmock/gmock-generated-matchers.h
M		googlemock/include/gmock/gmock-generated-matchers.h.pump
M		googlemock/include/gmock/gmock-spec-builders.h
M		googlemock/include/gmock/gmock.h
M		googlemock/msvc/2010/gmock.sln
M		googlemock/msvc/2010/gmock.vcxproj
M		googlemock/msvc/2010/gmock_config.props
M		googlemock/msvc/2010/gmock_main.vcxproj
M		googlemock/msvc/2010/gmock_test.vcxproj
M		googlemock/msvc/2015/gmock.sln
M		googlemock/msvc/2015/gmock.vcxproj
M		googlemock/msvc/2015/gmock_main.vcxproj
M		googlemock/msvc/2015/gmock_test.vcxproj
M		googlemock/scripts/fuse_gmock_files.py
M		googlemock/src/gmock-internal-utils.cc
M		googlemock/src/gmock-spec-builders.cc
M		googlemock/src/gmock.cc
P		googlemock/test/BUILD.bazel Copied to multiple locations: ci/build-linux-bazel.sh ci/env-linux.sh ci/env-osx.sh ci/install-linux.sh ci/install-osx.sh ci/log-config.sh
M		googlemock/test/gmock-cardinalities_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-spec-builders_test.cc
M		googlemock/test/gmock_test.cc
D		googletest/.gitignore
M		googletest/CMakeLists.txt
M		googletest/README.md
M		googletest/cmake/internal_utils.cmake
M		googletest/configure.ac
M		googletest/docs/AdvancedGuide.md
D		googletest/docs/DevGuide.md
M		googletest/docs/Documentation.md
M		googletest/docs/FAQ.md
M		googletest/docs/PumpManual.md
M		googletest/include/gtest/gtest-printers.h
M		googletest/include/gtest/internal/gtest-internal.h
M		googletest/include/gtest/internal/gtest-port-arch.h
M		googletest/include/gtest/internal/gtest-port.h
A	(dir)	googletest/msvc/2010/
A		googletest/msvc/2010/gtest-md.sln
A		googletest/msvc/2010/gtest-md.vcxproj
A		googletest/msvc/2010/gtest-md.vcxproj.filters
A		googletest/msvc/2010/gtest.sln
A		googletest/msvc/2010/gtest.vcxproj
A		googletest/msvc/2010/gtest.vcxproj.filters
A		googletest/msvc/2010/gtest_main-md.vcxproj
A		googletest/msvc/2010/gtest_main-md.vcxproj.filters
A		googletest/msvc/2010/gtest_main.vcxproj
A		googletest/msvc/2010/gtest_main.vcxproj.filters
A		googletest/msvc/2010/gtest_prod_test-md.vcxproj
A		googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters
A		googletest/msvc/2010/gtest_prod_test.vcxproj
A		googletest/msvc/2010/gtest_prod_test.vcxproj.filters
A		googletest/msvc/2010/gtest_unittest-md.vcxproj
A		googletest/msvc/2010/gtest_unittest-md.vcxproj.filters
A		googletest/msvc/2010/gtest_unittest.vcxproj
A		googletest/msvc/2010/gtest_unittest.vcxproj.filters
D		googletest/msvc/gtest-md.sln
D		googletest/msvc/gtest-md.vcproj
D		googletest/msvc/gtest.sln
D		googletest/msvc/gtest.vcproj
D		googletest/msvc/gtest_main-md.vcproj
D		googletest/msvc/gtest_main.vcproj
D		googletest/msvc/gtest_prod_test-md.vcproj
D		googletest/msvc/gtest_prod_test.vcproj
D		googletest/msvc/gtest_unittest-md.vcproj
D		googletest/msvc/gtest_unittest.vcproj
M		googletest/samples/sample10_unittest.cc
M		googletest/scripts/fuse_gtest_files.py
M		googletest/src/gtest-printers.cc
M		googletest/src/gtest.cc
M		googletest/test/gtest-death-test_test.cc
M		googletest/test/gtest-filepath_test.cc
M		googletest/test/gtest-options_test.cc
M		googletest/test/gtest-param-test_test.cc
M		googletest/test/gtest-port_test.cc
M		googletest/test/gtest-printers_test.cc
M		googletest/test/gtest_catch_exceptions_test_.cc
M		googletest/test/gtest_color_test_.cc
M		googletest/test/gtest_output_test_.cc
M		googletest/test/gtest_output_test_golden_lin.txt
M		googletest/test/gtest_repeat_test.cc
M		googletest/test/gtest_unittest.cc
M		googletest/test/gtest_xml_output_unittest.py
D		travis.sh