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

d54c906b

Commit d54c906b authored 8 years ago by Mark D. Roth

Downloads
- Plain Diff

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

parents 46658960 a3960b98

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb 7 additions, 0 deletions

src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb
src/ruby/pb/test/client.rb 165 additions, 6 deletions

src/ruby/pb/test/client.rb
tools/doxygen/Doxyfile.c++ 21 additions, 21 deletions

tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal 20 additions, 20 deletions

tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core 19 additions, 19 deletions

tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal 31 additions, 31 deletions

tools/doxygen/Doxyfile.core.internal

with 263 additions and 97 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