diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
| commit | 4d736a024ca45738412f7cf73994393b7f162811 (patch) | |
| tree | e2b5085817619e9aba3e4f88407f344b36e911af /vsprojects/vs2013/grpc.vcxproj | |
| parent | 2822e9ad7598a68597e49e8f1875486aa12bf267 (diff) | |
| parent | 8b131922438d96579cb315777ca980e094883496 (diff) | |
Resolved merge conflicts
Diffstat (limited to 'vsprojects/vs2013/grpc.vcxproj')
| -rw-r--r-- | vsprojects/vs2013/grpc.vcxproj | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj index dab819c51b..89c0de333c 100644 --- a/vsprojects/vs2013/grpc.vcxproj +++ b/vsprojects/vs2013/grpc.vcxproj @@ -85,10 +85,13 @@ <ClInclude Include="..\..\include\grpc\status.h" /> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\src\core\httpcli\format_request.h" /> + <ClInclude Include="..\..\src\core\httpcli\httpcli.h" /> + <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h" /> + <ClInclude Include="..\..\src\core\httpcli\parser.h" /> <ClInclude Include="..\..\src\core\security\auth.h" /> <ClInclude Include="..\..\src\core\security\base64.h" /> <ClInclude Include="..\..\src\core\security\credentials.h" /> - <ClInclude Include="..\..\src\core\security\google_root_certs.h" /> <ClInclude Include="..\..\src\core\security\json_token.h" /> <ClInclude Include="..\..\src\core\security\secure_transport_setup.h" /> <ClInclude Include="..\..\src\core\security\security_context.h" /> @@ -110,10 +113,7 @@ <ClInclude Include="..\..\src\core\channel\noop_filter.h" /> <ClInclude Include="..\..\src\core\compression\algorithm.h" /> <ClInclude Include="..\..\src\core\compression\message_compress.h" /> - <ClInclude Include="..\..\src\core\httpcli\format_request.h" /> - <ClInclude Include="..\..\src\core\httpcli\httpcli.h" /> - <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h" /> - <ClInclude Include="..\..\src\core\httpcli\parser.h" /> + <ClInclude Include="..\..\src\core\debug\trace.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm_heap.h" /> <ClInclude Include="..\..\src\core\iomgr\alarm_internal.h" /> @@ -187,6 +187,14 @@ <ClInclude Include="..\..\src\core\transport\transport_impl.h" /> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\src\core\httpcli\format_request.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\parser.c"> + </ClCompile> <ClCompile Include="..\..\src\core\security\auth.c"> </ClCompile> <ClCompile Include="..\..\src\core\security\base64.c"> @@ -195,8 +203,6 @@ </ClCompile> <ClCompile Include="..\..\src\core\security\factories.c"> </ClCompile> - <ClCompile Include="..\..\src\core\security\google_root_certs.c"> - </ClCompile> <ClCompile Include="..\..\src\core\security\json_token.c"> </ClCompile> <ClCompile Include="..\..\src\core\security\secure_endpoint.c"> @@ -207,6 +213,10 @@ </ClCompile> <ClCompile Include="..\..\src\core\security\server_secure_chttp2.c"> </ClCompile> + <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> + </ClCompile> <ClCompile Include="..\..\src\core\tsi\fake_transport_security.c"> </ClCompile> <ClCompile Include="..\..\src\core\tsi\ssl_transport_security.c"> @@ -243,13 +253,7 @@ </ClCompile> <ClCompile Include="..\..\src\core\compression\message_compress.c"> </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\format_request.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\httpcli_security_context.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\httpcli\parser.c"> + <ClCompile Include="..\..\src\core\debug\trace.c"> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\alarm.c"> </ClCompile> @@ -279,7 +283,9 @@ </ClCompile> <ClCompile Include="..\..\src\core\iomgr\pollset_windows.c"> </ClCompile> - <ClCompile Include="..\..\src\core\iomgr\resolve_address.c"> + <ClCompile Include="..\..\src\core\iomgr\resolve_address_posix.c"> + </ClCompile> + <ClCompile Include="..\..\src\core\iomgr\resolve_address_windows.c"> </ClCompile> <ClCompile Include="..\..\src\core\iomgr\sockaddr_utils.c"> </ClCompile> @@ -359,10 +365,6 @@ </ClCompile> <ClCompile Include="..\..\src\core\surface\metadata_array.c"> </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> - </ClCompile> - <ClCompile Include="..\..\src\core\surface\secure_server_create.c"> - </ClCompile> <ClCompile Include="..\..\src\core\surface\server.c"> </ClCompile> <ClCompile Include="..\..\src\core\surface\server_chttp2.c"> |