diff options
| author |  yang-g <yangg@google.com> | 2016-06-03 15:34:01 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-06-03 15:34:01 -0700 |
| commit | aaee544d69ad53f5b173e9602fa191201c8f52e0 (patch) | |
| tree | 9c5e2e2d98a4ba6000f63ee0d48f84b2e1457b3e /vsprojects/vcxproj/grpc_cli_libs/grpc_cli_libs.vcxproj.filters | |
| parent | 17487f9a22bd57fa05a0b4196bbb19f62ef7eb6c (diff) | |
| parent | 84f71932eaf8b601355189896fc5b91449ac82d2 (diff) | |
merge and resolve conflicts
Diffstat (limited to 'vsprojects/vcxproj/grpc_cli_libs/grpc_cli_libs.vcxproj.filters')
| -rw-r--r-- | vsprojects/vcxproj/grpc_cli_libs/grpc_cli_libs.vcxproj.filters | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/grpc_cli_libs/grpc_cli_libs.vcxproj.filters b/vsprojects/vcxproj/grpc_cli_libs/grpc_cli_libs.vcxproj.filters new file mode 100644 index 0000000000..55ef18bf30 --- /dev/null +++ b/vsprojects/vcxproj/grpc_cli_libs/grpc_cli_libs.vcxproj.filters @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="$(SolutionDir)\..\test\cpp\util\cli_call.cc"> + <Filter>test\cpp\util</Filter> + </ClCompile> + <ClCompile Include="$(SolutionDir)\..\test\cpp\util\proto_file_parser.cc"> + <Filter>test\cpp\util</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="$(SolutionDir)\..\test\cpp\util\cli_call.h"> + <Filter>test\cpp\util</Filter> + </ClInclude> + <ClInclude Include="$(SolutionDir)\..\test\cpp\util\proto_file_parser.h"> + <Filter>test\cpp\util</Filter> + </ClInclude> + </ItemGroup> + + <ItemGroup> + <Filter Include="test"> + <UniqueIdentifier>{16a32a9f-93aa-5812-5a5e-be659aaa76aa}</UniqueIdentifier> + </Filter> + <Filter Include="test\cpp"> + <UniqueIdentifier>{a6049b9f-9c4c-f814-ac67-dbd2b628b2d0}</UniqueIdentifier> + </Filter> + <Filter Include="test\cpp\util"> + <UniqueIdentifier>{30f91d14-0a6a-c8e8-ff23-6a83142d42fd}</UniqueIdentifier> + </Filter> + </ItemGroup> +</Project> + |