Merge branch 'master' into master
16c65a476a12
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Aug 1 2018, 17:09.

Description

Merge branch 'master' into master

Committed

GitHub <noreply@github.com>

Aug 1 2018, 17:09

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:16c65a476a12: Merge branch 'master' into master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Aug 1 2018, 17:09

Commit	Author	Details	Committed
572b07ff8d93	Gennadiy Civil/GitHub	Merge pull request #1685 from einsteinsfool/master	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

				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			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/gtest-death-test_test.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