diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-12 01:14:17 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-08-12 01:14:17 +0200 |
| commit | b457cd831ad519d5ec023005ba6ccfb52ff4c9cb (patch) | |
| tree | 75575c3da2adaf0e44a382558428b0eb47f5ab43 /vsprojects/grpc++/grpc++.vcxproj | |
| parent | f0b417dc84d52ebd3890751b0ee331f9eee49e37 (diff) | |
| parent | 73578f7f62df4fd03035ad8e04c43b492649a064 (diff) | |
Merge remote-tracking branch 'google/master' into the-ultimate-showdown
Conflicts:
src/csharp/ext/grpc_csharp_ext.c
Diffstat (limited to 'vsprojects/grpc++/grpc++.vcxproj')
| -rw-r--r-- | vsprojects/grpc++/grpc++.vcxproj | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vsprojects/grpc++/grpc++.vcxproj b/vsprojects/grpc++/grpc++.vcxproj index 58474511fc..929bc1500e 100644 --- a/vsprojects/grpc++/grpc++.vcxproj +++ b/vsprojects/grpc++/grpc++.vcxproj @@ -216,7 +216,6 @@ <ClInclude Include="..\..\include\grpc++\async_generic_service.h" /> <ClInclude Include="..\..\include\grpc++\async_unary_call.h" /> <ClInclude Include="..\..\include\grpc++\auth_context.h" /> - <ClInclude Include="..\..\include\grpc++\auth_property_iterator.h" /> <ClInclude Include="..\..\include\grpc++\byte_buffer.h" /> <ClInclude Include="..\..\include\grpc++\channel_arguments.h" /> <ClInclude Include="..\..\include\grpc++\channel_interface.h" /> |