diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-05-06 15:50:15 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-05-06 15:50:15 -0700 |
| commit | 26a1785cfc5a2118b5fbb4c2e7e89edd6a241a61 (patch) | |
| tree | 851f2b92ccd86254bbb0d973462932a1d555fab6 /vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj | |
| parent | 7d099a5c907d9ab164416ea875ae07a3074adedb (diff) | |
| parent | c916c1ce17fe273dff881e1c87e17ad991c2078a (diff) | |
Resolve conflicts
Diffstat (limited to 'vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj')
| -rw-r--r-- | vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj index 9465d2ac42..895e223351 100644 --- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj @@ -333,6 +333,7 @@ <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\sync_stream.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\time.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer.h" /> + <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\byte_buffer_reader.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\compression_types.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\connectivity_state.h" /> <ClInclude Include="$(SolutionDir)\..\include\grpc\impl\codegen\grpc_types.h" /> |