diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2015-08-27 16:07:46 -0700 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2015-08-27 16:07:46 -0700 |
| commit | 459faf3821b74329f5f1debdba21abe03e3a6e74 (patch) | |
| tree | 2046a5d7f4f119f0770154393c4308394f26f19b /vsprojects/grpc_python_plugin | |
| parent | 35b559f6f7e4e6410613632bbfe3f2ab84073feb (diff) | |
| parent | 1029e7049cea55a8880b8fe9167bd3f0e483b037 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor
Diffstat (limited to 'vsprojects/grpc_python_plugin')
| -rw-r--r-- | vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj b/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj index 02bab1c61b..a1e3a4aa6c 100644 --- a/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj +++ b/vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj @@ -48,6 +48,7 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="..\protoc.props" /> + <Import Project="..\protobuf.props" /> <Import Project="..\global.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> |