diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-03-03 07:44:27 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-03-03 07:44:27 -0800 |
| commit | 01ea61e4823d9869090e18283409ac4447988cfc (patch) | |
| tree | 5d599cb0357394abd48d6e549f5c0275e2a1b428 /vsprojects/vs2013/grpc.vcxproj.filters | |
| parent | 7e0d99f72b5347b9266e4527ef3d6c27da2087b7 (diff) | |
| parent | 0cfc638d1955ddea4146864db8a2e0294f609249 (diff) | |
Merge github.com:grpc/grpc into credit
Conflicts:
build.json
src/cpp/client/credentials.cc
vsprojects/vs2013/grpc.vcxproj
vsprojects/vs2013/grpc.vcxproj.filters
vsprojects/vs2013/grpc_shared.vcxproj
vsprojects/vs2013/grpc_shared.vcxproj.filters
vsprojects/vs2013/grpc_unsecure.vcxproj
vsprojects/vs2013/grpc_unsecure.vcxproj.filters
Diffstat (limited to 'vsprojects/vs2013/grpc.vcxproj.filters')
| -rw-r--r-- | vsprojects/vs2013/grpc.vcxproj.filters | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/vsprojects/vs2013/grpc.vcxproj.filters b/vsprojects/vs2013/grpc.vcxproj.filters index a3b5b239c3..af38d8de35 100644 --- a/vsprojects/vs2013/grpc.vcxproj.filters +++ b/vsprojects/vs2013/grpc.vcxproj.filters @@ -49,6 +49,9 @@ <ClCompile Include="..\..\src\core\security\server_secure_chttp2.c"> <Filter>src\core\security</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\surface\init_secure.c"> + <Filter>src\core\surface</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\surface\secure_channel_create.c"> <Filter>src\core\surface</Filter> </ClCompile> @@ -283,6 +286,9 @@ <ClCompile Include="..\..\src\core\surface\server_create.c"> <Filter>src\core\surface</Filter> </ClCompile> + <ClCompile Include="..\..\src\core\surface\surface_trace.c"> + <Filter>src\core\surface</Filter> + </ClCompile> <ClCompile Include="..\..\src\core\transport\chttp2\alpn.c"> <Filter>src\core\transport\chttp2</Filter> </ClCompile> @@ -587,6 +593,9 @@ <ClInclude Include="..\..\src\core\surface\event_string.h"> <Filter>src\core\surface</Filter> </ClInclude> + <ClInclude Include="..\..\src\core\surface\init.h"> + <Filter>src\core\surface</Filter> + </ClInclude> <ClInclude Include="..\..\src\core\surface\server.h"> <Filter>src\core\surface</Filter> </ClInclude> |