Merge github.com:grpc/grpc into delete-the-old-api
Conflicts: vsprojects/Grpc.mak
No related branches found
No related tags found
Showing
- src/core/support/cpu_windows.c 5 additions, 7 deletionssrc/core/support/cpu_windows.c
- src/core/surface/call.c 4 additions, 0 deletionssrc/core/surface/call.c
- src/csharp/ext/grpc_csharp_ext.c 0 additions, 10 deletionssrc/csharp/ext/grpc_csharp_ext.c
- src/python/src/grpc/_adapter/_call.h 1 addition, 1 deletionsrc/python/src/grpc/_adapter/_call.h
- src/python/src/grpc/_adapter/_channel.h 1 addition, 1 deletionsrc/python/src/grpc/_adapter/_channel.h
- src/python/src/grpc/_adapter/_client_credentials.h 1 addition, 1 deletionsrc/python/src/grpc/_adapter/_client_credentials.h
- src/python/src/grpc/_adapter/_completion_queue.c 3 additions, 1 deletionsrc/python/src/grpc/_adapter/_completion_queue.c
- src/python/src/grpc/_adapter/_completion_queue.h 1 addition, 1 deletionsrc/python/src/grpc/_adapter/_completion_queue.h
- src/python/src/grpc/_adapter/_server_credentials.h 1 addition, 1 deletionsrc/python/src/grpc/_adapter/_server_credentials.h
- src/python/src/grpc/_adapter/_tag.h 1 addition, 1 deletionsrc/python/src/grpc/_adapter/_tag.h
- src/python/src/setup.py 1 addition, 1 deletionsrc/python/src/setup.py
- templates/vsprojects/Grpc.mak.template 2 additions, 2 deletionstemplates/vsprojects/Grpc.mak.template
- test/core/fling/server.c 2 additions, 1 deletiontest/core/fling/server.c
- vsprojects/Grpc.mak 786 additions, 2 deletionsvsprojects/Grpc.mak
Loading
Please register or sign in to comment