Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/googletest
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 983923a72ffb
Choose a base ref
...
head repository: mockingbirdnest/googletest
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f286379e819f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 6, 2021

  1. Get glog from the right path.

    pleroy committed Jun 6, 2021
    Copy the full SHA
    f286379 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 googlemock/msvc/gmock_main.vcxproj
4 changes: 2 additions & 2 deletions googlemock/msvc/gmock_main.vcxproj
Original file line number Diff line number Diff line change
@@ -35,14 +35,14 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\googletest\msvc\portability_macros.props" />
<Import Project="google_googletest.props" />
<Import Project="..\..\..\glog\vsprojects\static_linking.props" />
<Import Project="..\..\..\glog\msvc\static_linking.props" />
<Import Project="google_glog.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\googletest\msvc\portability_macros.props" />
<Import Project="google_googletest.props" />
<Import Project="..\..\..\glog\vsprojects\static_linking.props" />
<Import Project="..\..\..\glog\msvc\static_linking.props" />
<Import Project="google_glog.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />