aboutsummaryrefslogtreecommitdiffhomepage
path: root/vsprojects/grpc++/grpc++.vcxproj
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2015-08-24 15:05:11 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2015-08-24 15:31:59 -0700
commite4f7c2fd13b8e417ec04abcc06c162c607cadfd8 (patch)
treee2932474936530c8816107e9ffee30f9c1656f1d /vsprojects/grpc++/grpc++.vcxproj
parentd09bae5b488cc235b11d4c2446accaf3160322c7 (diff)
parentd7af736794fcdc3b8dd1ffda4a97f12b58e326c8 (diff)
Merge branch 'master' of github.com:grpc/grpc into compression-accept-encoding
Diffstat (limited to 'vsprojects/grpc++/grpc++.vcxproj')
-rw-r--r--vsprojects/grpc++/grpc++.vcxproj6
1 files changed, 3 insertions, 3 deletions
diff --git a/vsprojects/grpc++/grpc++.vcxproj b/vsprojects/grpc++/grpc++.vcxproj
index 929bc1500e..cd85abd04a 100644
--- a/vsprojects/grpc++/grpc++.vcxproj
+++ b/vsprojects/grpc++/grpc++.vcxproj
@@ -225,8 +225,6 @@
<ClInclude Include="..\..\include\grpc++\config_protobuf.h" />
<ClInclude Include="..\..\include\grpc++\create_channel.h" />
<ClInclude Include="..\..\include\grpc++\credentials.h" />
- <ClInclude Include="..\..\include\grpc++\dynamic_thread_pool.h" />
- <ClInclude Include="..\..\include\grpc++\fixed_size_thread_pool.h" />
<ClInclude Include="..\..\include\grpc++\generic_stub.h" />
<ClInclude Include="..\..\include\grpc++\impl\call.h" />
<ClInclude Include="..\..\include\grpc++\impl\client_unary_call.h" />
@@ -252,7 +250,6 @@
<ClInclude Include="..\..\include\grpc++\status_code_enum.h" />
<ClInclude Include="..\..\include\grpc++\stream.h" />
<ClInclude Include="..\..\include\grpc++\stub_options.h" />
- <ClInclude Include="..\..\include\grpc++\thread_pool_interface.h" />
<ClInclude Include="..\..\include\grpc++\time.h" />
</ItemGroup>
<ItemGroup>
@@ -261,6 +258,9 @@
<ClInclude Include="..\..\src\cpp\server\secure_server_credentials.h" />
<ClInclude Include="..\..\src\cpp\client\channel.h" />
<ClInclude Include="..\..\src\cpp\common\create_auth_context.h" />
+ <ClInclude Include="..\..\src\cpp\server\dynamic_thread_pool.h" />
+ <ClInclude Include="..\..\src\cpp\server\fixed_size_thread_pool.h" />
+ <ClInclude Include="..\..\src\cpp\server\thread_pool_interface.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\cpp\client\secure_channel_arguments.cc">