Merge branch 'win32_subprocess' into make-ruby-installable
Conflicts: BUILD Makefile binding.gyp build.yaml gRPC.podspec grpc.gemspec src/python/grpcio/grpc_core_dependencies.py tools/run_tests/sources_and_headers.json vsprojects/vcxproj/gpr/gpr.vcxproj vsprojects/vcxproj/gpr/gpr.vcxproj.filters
No related branches found
No related tags found
Showing
- BUILD 3 additions, 0 deletionsBUILD
- Makefile 2 additions, 0 deletionsMakefile
- binding.gyp 1 addition, 0 deletionsbinding.gyp
- build.yaml 1 addition, 0 deletionsbuild.yaml
- gRPC.podspec 1 addition, 0 deletionsgRPC.podspec
- grpc.gemspec 1 addition, 0 deletionsgrpc.gemspec
- include/grpc/impl/codegen/port_platform.h 1 addition, 0 deletionsinclude/grpc/impl/codegen/port_platform.h
- package.json 1 addition, 0 deletionspackage.json
- src/core/support/subprocess_windows.c 141 additions, 0 deletionssrc/core/support/subprocess_windows.c
- src/python/grpcio/grpc_core_dependencies.py 1 addition, 0 deletionssrc/python/grpcio/grpc_core_dependencies.py
- tools/doxygen/Doxyfile.core.internal 1 addition, 0 deletionstools/doxygen/Doxyfile.core.internal
- tools/run_tests/sources_and_headers.json 2 additions, 0 deletionstools/run_tests/sources_and_headers.json
- vsprojects/vcxproj/grpc/grpc.vcxproj 2 additions, 0 deletionsvsprojects/vcxproj/grpc/grpc.vcxproj
- vsprojects/vcxproj/grpc/grpc.vcxproj.filters 3 additions, 0 deletionsvsprojects/vcxproj/grpc/grpc.vcxproj.filters
- vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj 2 additions, 0 deletionsvsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
- vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters 3 additions, 0 deletions...jects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
Loading
Please register or sign in to comment