diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-07-30 16:15:58 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-07-30 16:15:58 -0700 |
| commit | 70e9b3d2a2940fc3db2124314938974c66ca14bc (patch) | |
| tree | 444da10d04d857e45a2c4a387773e115299d9246 /vsprojects/grpc_unsecure | |
| parent | 561300fba09145fe0b2a0731c480815bea3dacfd (diff) | |
| parent | 9b0fd3b317d59de21a67ec11001d30d2ae7c2053 (diff) | |
Merge github.com:grpc/grpc into plucking-hell
Diffstat (limited to 'vsprojects/grpc_unsecure')
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | 1 | ||||
| -rw-r--r-- | vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj index f4be762f23..829e8e1d38 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj @@ -225,7 +225,6 @@ <ClInclude Include="..\..\include\grpc\census.h" /> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\src\core\census\grpc_context.h" /> <ClInclude Include="..\..\src\core\channel\census_filter.h" /> <ClInclude Include="..\..\src\core\channel\channel_args.h" /> <ClInclude Include="..\..\src\core\channel\channel_stack.h" /> diff --git a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters index d951280393..3ca80d3a35 100644 --- a/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -362,9 +362,6 @@ </ClInclude> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\src\core\census\grpc_context.h"> - <Filter>src\core\census</Filter> - </ClInclude> <ClInclude Include="..\..\src\core\channel\census_filter.h"> <Filter>src\core\channel</Filter> </ClInclude> |