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

eb327fba

Commit eb327fba authored 9 years ago by Craig Tiller

Downloads
- Patches
- Plain Diff

Make it less likely a build.json change triggers a merge conflict

parent 6b4fc31f

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

gRPC.podspec 404 additions, 2 deletions

gRPC.podspec
templates/gRPC.podspec.template 19 additions, 23 deletions

templates/gRPC.podspec.template
templates/tools/doxygen/Doxyfile.include 1 addition, 1 deletion

templates/tools/doxygen/Doxyfile.include
tools/doxygen/Doxyfile.c++ 37 additions, 1 deletion

tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal 67 additions, 1 deletion

tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core 35 additions, 1 deletion

tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal 296 additions, 1 deletion

tools/doxygen/Doxyfile.core.internal

with 859 additions and 30 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