Merge branch 'master' into fix-top-level-license
cb95f316c8f5
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Dec 11 2017, 19:13.

Description

Merge branch 'master' into fix-top-level-license

Committed

GitHub <noreply@github.com>

Dec 11 2017, 19:13

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:cb95f316c8f5: Merge branch 'master' into fix-top-level-license (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Dec 11 2017, 19:13

Commit	Author	Details	Committed
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
bc3320b7f1da	Carlos O'Ryan	Implement bazel-based builds in Travis.	Dec 9 2017
10ef1d9a1e7e	Gennadiy Civil/GitHub	Merge branch 'master' into use-system-includes	Dec 8 2017
ce919c3ddf80	Gennadiy Civil/GitHub	Merge branch 'master' into use-system-includes	Dec 1 2017
f46bd00e369e	Sam Lunt/Sam Lunt	make includes system	Nov 28 2017

		Path
M		.travis.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
V		{ci ← }/travis.sh
M		googlemock/CMakeLists.txt
M		googletest/CMakeLists.txt
V		{ → ci}/travis.sh