diff options
| author | Alyssa Wilk <alyssar@chromium.org> | 2017-08-28 20:10:12 (GMT) |
|---|---|---|
| committer | Alyssa Wilk <alyssar@chromium.org> | 2017-08-28 20:10:12 (GMT) |
| commit | c00373320db8cfbd1524e73e7b2793a22ecb2672 (patch) | |
| tree | fe20e7200424c65ab9acb8ff38ff1b2e86204ba6 /googlemock/msvc/2010/gmock_config.props | |
| parent | a2803bc37dafdaad05b335e64a83aff03096a4ba (diff) | |
| parent | b43bfcf49166599955ba3713952bc6c0e96b421b (diff) | |
| download | googletest-c00373320db8cfbd1524e73e7b2793a22ecb2672.zip googletest-c00373320db8cfbd1524e73e7b2793a22ecb2672.tar.gz googletest-c00373320db8cfbd1524e73e7b2793a22ecb2672.tar.bz2 | |
Merge branch 'refs/heads/master' into flag-default
Diffstat (limited to 'googlemock/msvc/2010/gmock_config.props')
| -rw-r--r-- | googlemock/msvc/2010/gmock_config.props | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/msvc/2010/gmock_config.props b/googlemock/msvc/2010/gmock_config.props index 441f31c..017d710 100644 --- a/googlemock/msvc/2010/gmock_config.props +++ b/googlemock/msvc/2010/gmock_config.props @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
<GTestDir>../../../googletest</GTestDir>
@@ -16,4 +16,4 @@ <Value>$(GTestDir)</Value>
</BuildMacro>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file |