diff options
| author |  yang-g <yangg@google.com> | 2015-08-24 16:08:36 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-08-24 16:08:36 -0700 |
| commit | 9d1f0c4a0c31e18e21770cfaf5a29ed1db94da89 (patch) | |
| tree | 9b27baca2b5df75ba78a04b394d14817fca4f68e /vsprojects/grpc_plugin_support | |
| parent | 3db9d017292fd8bb6be99267b82b534a42aaa1c6 (diff) | |
Fix merge failures
Diffstat (limited to 'vsprojects/grpc_plugin_support')
| -rw-r--r-- | vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj b/vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj index 444d796137..9f098d10a1 100644 --- a/vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj +++ b/vsprojects/grpc_plugin_support/grpc_plugin_support.vcxproj @@ -122,8 +122,8 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClInclude Include="..\..\include\grpc++\config.h" /> - <ClInclude Include="..\..\include\grpc++\config_protobuf.h" /> + <ClInclude Include="..\..\include\grpc++\support\config.h" /> + <ClInclude Include="..\..\include\grpc++\support\config_protobuf.h" /> <ClInclude Include="..\..\src\compiler\config.h" /> <ClInclude Include="..\..\src\compiler\cpp_generator.h" /> <ClInclude Include="..\..\src\compiler\cpp_generator_helpers.h" /> |