Merge branch 'master' into master
87327b12e9b1
Actions

Authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com> on Aug 23 2017, 20:27.

Description

Merge branch 'master' into master

Committed

GitHub <noreply@github.com>

Aug 23 2017, 20:27

Pushed

• trottet

Dec 4 2019, 13:52

Parents

Branches

Unknown

Tags

Unknown

GitHub <noreply@github.com> committed R9484:87327b12e9b1: Merge branch 'master' into master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Aug 23 2017, 20:27

Commit	Author	Details	Committed
c38baf985831	Gennadiy Civil/GitHub	Merge pull request #1219 from KindDragon/vs-projects-fix	Aug 23 2017
f4abce46093d	Gennadiy Civil/GitHub	Merge branch 'master' into vs-projects-fix	Aug 23 2017
88269cd365fa	Arkady Shapkin	Support x64 configuration for old VS2010 projects	Aug 23 2017

		Path
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
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