Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grpc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

603aec9e

Commit 603aec9e authored 10 years ago by Jan Tattermusch

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into csharp_new_api

parents 8d2e5723 3c65bca2

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

INSTALL 38 additions, 0 deletions

INSTALL
Makefile 2 additions, 0 deletions

Makefile
include/grpc++/client_context.h 2 additions, 2 deletions

include/grpc++/client_context.h
include/grpc++/server_context.h 1 addition, 1 deletion

include/grpc++/server_context.h
include/grpc/grpc.h 16 additions, 3 deletions

include/grpc/grpc.h
templates/Makefile.template 2 additions, 0 deletions

templates/Makefile.template
tools/run_tests/run_tests.py 7 additions, 4 deletions

tools/run_tests/run_tests.py

with 68 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment