diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-08-12 12:00:36 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-08-12 12:00:36 -0700 |
| commit | d067c263b250657891de4ad96ae51249435c6066 (patch) | |
| tree | 03611c21ff494f0652e70d424af1dddae4c1da28 /vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters | |
| parent | d5689305612f5597716a4337ce934883a472a266 (diff) | |
| parent | 826f07eb6f8dc2366375b7c96cc12bca1302518c (diff) | |
Merge github.com:grpc/grpc into y12kdm3
Conflicts:
src/core/security/google_default_credentials.c
test/core/security/verify_jwt.c
Diffstat (limited to 'vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters')
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters index 0b86f87412..05e9d139e0 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -82,6 +82,15 @@ <ClCompile Include="..\..\src\core\debug\trace.c"> <Filter>src\core\debug</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\format_request.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\httpcli.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> + <ClCompile Include="..\..\src\core\httpcli\parser.c"> + <Filter>src\core\httpcli</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\iomgr\alarm.c"> <Filter>src\core\iomgr</Filter> </ClCompile> @@ -446,6 +455,15 @@ <ClInclude Include="..\..\src\core\debug\trace.h"> <Filter>src\core\debug</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\httpcli\format_request.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> + <ClInclude Include="..\..\src\core\httpcli\httpcli.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> + <ClInclude Include="..\..\src\core\httpcli\parser.h"> + <Filter>src\core\httpcli</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\iomgr\alarm.h"> <Filter>src\core\iomgr</Filter> </ClInclude> @@ -701,6 +719,9 @@ <Filter Include="src\core\debug"> <UniqueIdentifier>{6d8d5774-7291-554d-fafa-583463cd3fd9}</UniqueIdentifier> </Filter> + <Filter Include="src\core\httpcli"> + <UniqueIdentifier>{1ba3a245-47e7-89b5-b0c9-aca758bd0277}</UniqueIdentifier> + </Filter> <Filter Include="src\core\iomgr"> <UniqueIdentifier>{a9df8b24-ecea-ff6d-8999-d8fa54cd70bf}</UniqueIdentifier> </Filter> |