diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-09-09 11:31:25 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-09-09 11:31:25 -0700 |
| commit | d0989101f520bdfe961605f198ddc50c7657011d (patch) | |
| tree | 5f5f33097791f281f211bc45d4da816d9f230f53 /vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters | |
| parent | 509ee4c11127700986ceb05c020d2ceef5667852 (diff) | |
| parent | 61a420e9966e0b628c710bd4c2db2409bc1cfad9 (diff) | |
Merge branch 'master' into fix_channel_from_fd_api
Diffstat (limited to 'vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters')
| -rw-r--r-- | vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 99db98eb7c..fba5a02099 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -361,9 +361,6 @@ <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.c"> <Filter>src\core\ext\client_config</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c"> - <Filter>src\core\ext\client_config</Filter> - </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config_plugin.c"> <Filter>src\core\ext\client_config</Filter> </ClCompile> @@ -397,10 +394,10 @@ <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.c"> <Filter>src\core\ext\client_config</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_result.c"> <Filter>src\core\ext\client_config</Filter> </ClCompile> - <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.c"> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.c"> <Filter>src\core\ext\client_config</Filter> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.c"> @@ -454,6 +451,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\gen\census.pb.c"> <Filter>src\core\ext\census\gen</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\gen\trace_context.pb.c"> + <Filter>src\core\ext\census\gen</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\ext\census\grpc_context.c"> <Filter>src\core\ext\census</Filter> </ClCompile> @@ -501,6 +501,9 @@ <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_posix.h"> <Filter>include\grpc</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\include\grpc\grpc_security_constants.h"> + <Filter>include\grpc</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\include\grpc\status.h"> <Filter>include\grpc</Filter> </ClInclude> @@ -881,9 +884,6 @@ <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_channel_factory.h"> <Filter>src\core\ext\client_config</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.h"> - <Filter>src\core\ext\client_config</Filter> - </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\connector.h"> <Filter>src\core\ext\client_config</Filter> </ClInclude> @@ -911,10 +911,10 @@ <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_registry.h"> <Filter>src\core\ext\client_config</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h"> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\resolver_result.h"> <Filter>src\core\ext\client_config</Filter> </ClInclude> - <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_call_holder.h"> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel.h"> <Filter>src\core\ext\client_config</Filter> </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\ext\client_config\subchannel_index.h"> @@ -965,6 +965,9 @@ <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\gen\census.pb.h"> <Filter>src\core\ext\census\gen</Filter> </ClInclude> + <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\gen\trace_context.pb.h"> + <Filter>src\core\ext\census\gen</Filter> + </ClInclude> <ClInclude Include="$(SolutionDir)\..\src\core\ext\census\grpc_filter.h"> <Filter>src\core\ext\census</Filter> </ClInclude> |