Diffusion sp4e-homework-lars-bertil 9997a830ee55

Merge pull request #2242 from SylvestreG:master
9997a830ee55
Actions

Authored by Gennadiy Civil <misterg@google.com> on Apr 29 2019, 21:22.

Description

Merge pull request #2242 from SylvestreG:master

PiperOrigin-RevId: 245798478

Details

Committed

Gennadiy Civil <misterg@google.com>

Apr 29 2019, 21:22

Pushed

• trottet

Dec 4 2019, 13:52

Parents

R9484:9037e9bda103: Fix compilation on CentOS 7
R9484:3c911d2de2ab: Removing obsolete msvc 2005 and 2010

Branches

Unknown

Tags

Unknown

Event Timeline

Gennadiy Civil <misterg@google.com> committed R9484:9997a830ee55: Merge pull request #2242 from SylvestreG:master (authored by Gennadiy Civil <misterg@google.com>).Apr 29 2019, 21:22

Merged Changes

	Commit			Author	Details	Committed
	9037e9bda103			Sylvestre Gallon	Fix compilation on CentOS 7	Apr 26 2019

Changes (40)

		Path
A	(dir)	googlemock/msvc/2005/
P		googlemock/msvc/2005/gmock.sln Copied from googlemock/msvc/2015/gmock.sln
A		googlemock/msvc/2005/gmock.vcproj
A		googlemock/msvc/2005/gmock_config.vsprops
A		googlemock/msvc/2005/gmock_main.vcproj
A		googlemock/msvc/2005/gmock_test.vcproj
A	(dir)	googlemock/msvc/2010/
P		googlemock/msvc/2010/gmock.sln Copied from googlemock/msvc/2015/gmock.sln
P		googlemock/msvc/2010/gmock.vcxproj Copied from googlemock/msvc/2015/gmock.vcxproj
P		googlemock/msvc/2010/gmock_config.props Copied from googlemock/msvc/2015/gmock_config.props
P		googlemock/msvc/2010/gmock_main.vcxproj Copied from googlemock/msvc/2015/gmock_main.vcxproj
P		googlemock/msvc/2010/gmock_test.vcxproj Copied from googlemock/msvc/2015/gmock_test.vcxproj
M		googletest/CMakeLists.txt
A	(dir)	googletest/codegear/
A		googletest/codegear/gtest.cbproj
A		googletest/codegear/gtest.groupproj
P		googletest/codegear/gtest_all.cc Copied from googlemock/include/gmock/internal/custom/gmock-port.h
P		googletest/codegear/gtest_link.cc Copied from googlemock/include/gmock/internal/custom/gmock-matchers.h
A		googletest/codegear/gtest_main.cbproj
A		googletest/codegear/gtest_unittest.cbproj
A	(dir)	googletest/msvc/
A	(dir)	googletest/msvc/2010/
A		googletest/msvc/2010/gtest-md.sln
P		googletest/msvc/2010/gtest-md.vcxproj Copied from googlemock/msvc/2015/gmock.vcxproj
A		googletest/msvc/2010/gtest-md.vcxproj.filters
A		googletest/msvc/2010/gtest.sln
P		googletest/msvc/2010/gtest.vcxproj Copied from googlemock/msvc/2015/gmock.vcxproj
A		googletest/msvc/2010/gtest.vcxproj.filters
P		googletest/msvc/2010/gtest_main-md.vcxproj Copied from googlemock/msvc/2015/gmock.vcxproj
A		googletest/msvc/2010/gtest_main-md.vcxproj.filters
P		googletest/msvc/2010/gtest_main.vcxproj Copied from googlemock/msvc/2015/gmock.vcxproj
A		googletest/msvc/2010/gtest_main.vcxproj.filters
P		googletest/msvc/2010/gtest_prod_test-md.vcxproj Copied from googlemock/msvc/2015/gmock_test.vcxproj
A		googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters
P		googletest/msvc/2010/gtest_prod_test.vcxproj Copied from googlemock/msvc/2015/gmock_test.vcxproj
A		googletest/msvc/2010/gtest_prod_test.vcxproj.filters
P		googletest/msvc/2010/gtest_unittest-md.vcxproj Copied from googlemock/msvc/2015/gmock_test.vcxproj
A		googletest/msvc/2010/gtest_unittest-md.vcxproj.filters
P		googletest/msvc/2010/gtest_unittest.vcxproj Copied from googlemock/msvc/2015/gmock_test.vcxproj
A		googletest/msvc/2010/gtest_unittest.vcxproj.filters