aboutsummaryrefslogtreecommitdiffhomepage
path: root/vsprojects/grpc.sln
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-05-23 22:55:34 +0000
committerGravatar Craig Tiller <ctiller@google.com>2017-05-23 22:55:34 +0000
commit674af8f23ea1780ed0803d626df74408299e46c7 (patch)
tree2a95de9044e5d0e5d25f0bf9d1850d33ca3fa72a /vsprojects/grpc.sln
parentd3ec4aaf6f52387d27d02ae80b18bdcaf65828d6 (diff)
parent0a94f3c8ab55dfd12c14058d57f33121c8d6c411 (diff)
Merge github.com:grpc/grpc into thread_pool
Diffstat (limited to 'vsprojects/grpc.sln')
-rw-r--r--vsprojects/grpc.sln2
1 files changed, 1 insertions, 1 deletions
diff --git a/vsprojects/grpc.sln b/vsprojects/grpc.sln
index 307ae4b599..d4a84fc20a 100644
--- a/vsprojects/grpc.sln
+++ b/vsprojects/grpc.sln
@@ -63,7 +63,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc++", "vcxproj\.\grpc++\
EndProjectSection
ProjectSection(ProjectDependencies) = postProject
{29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9}
- {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc++_error_details", "vcxproj\.\grpc++_error_details\grpc++_error_details.vcxproj", "{9F58AD72-49E1-4D10-B826-9E190AB0AAC0}"
@@ -81,6 +80,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc++_unsecure", "vcxproj\
ProjectSection(ProjectDependencies) = postProject
{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5} = {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}
+ {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_create_jwt", "vcxproj\.\grpc_create_jwt\grpc_create_jwt.vcxproj", "{77971F8D-F583-3E77-0E3C-6C1FB6B1749C}"