Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts: gRPC.podspec tools/doxygen/Doxyfile.core.internal
No related branches found
No related tags found
Showing
- BUILD 4 additions, 0 deletionsBUILD
- build.json 2 additions, 0 deletionsbuild.json
- gRPC.podspec 2 additions, 3 deletionsgRPC.podspec
- src/core/iomgr/tcp_windows.c 1 addition, 1 deletionsrc/core/iomgr/tcp_windows.c
- src/php/README.md 12 additions, 8 deletionssrc/php/README.md
- src/php/bin/run_tests.sh 23 additions, 7 deletionssrc/php/bin/run_tests.sh
- src/php/ext/grpc/CREDITS 3 additions, 0 deletionssrc/php/ext/grpc/CREDITS
- src/php/ext/grpc/LICENSE 32 additions, 0 deletionssrc/php/ext/grpc/LICENSE
- src/php/ext/grpc/README.md 72 additions, 0 deletionssrc/php/ext/grpc/README.md
- src/php/ext/grpc/package.xml 82 additions, 0 deletionssrc/php/ext/grpc/package.xml
- templates/gRPC.podspec.template 0 additions, 1 deletiontemplates/gRPC.podspec.template
- tools/doxygen/Doxyfile.core.internal 1 addition, 1 deletiontools/doxygen/Doxyfile.core.internal
- tools/jenkins/grpc_jenkins_slave/Dockerfile 6 additions, 3 deletionstools/jenkins/grpc_jenkins_slave/Dockerfile
- vsprojects/grpc/grpc.vcxproj 2 additions, 0 deletionsvsprojects/grpc/grpc.vcxproj
- vsprojects/grpc/grpc.vcxproj.filters 6 additions, 0 deletionsvsprojects/grpc/grpc.vcxproj.filters
- vsprojects/grpc_unsecure/grpc_unsecure.vcxproj 2 additions, 0 deletionsvsprojects/grpc_unsecure/grpc_unsecure.vcxproj
- vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters 6 additions, 0 deletionsvsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters
Loading
Please register or sign in to comment