diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-09-01 00:05:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-01 00:05:22 -0400 |
commit | ee53b281ba16f5402e3a42003414a68d336fcd94 (patch) | |
tree | 2e629c5674eb80d2090aca0c27f8388d5b4801da /googlemock/msvc/2010/gmock_config.props | |
parent | ca76206f4268a009427afa96dfd792012db64583 (diff) | |
parent | 69e794ca75e6c07ad78a8f7467c267be9ac08921 (diff) | |
download | googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.tar.gz googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.tar.bz2 googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.zip |
Merge branch 'master' into user_logger_instead_of_printf
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 441f31cf..017d710b 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 |