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

9e41c0e0

Commit 9e41c0e0 authored 8 years ago by makdharma Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #7288 from makdharma/protobuf_import_issue7219

fixes #7259

parents 6bb39d0d 027ae0b4

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/compiler/objective_c_plugin.cc 21 additions, 2 deletions

src/compiler/objective_c_plugin.cc
src/objective-c/tests/InteropTests.m 6 additions, 7 deletions

src/objective-c/tests/InteropTests.m
src/objective-c/tests/RemoteTestClient/RemoteTest.podspec 3 additions, 1 deletion

src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
src/objective-c/tests/RemoteTestClient/empty.proto 0 additions, 44 deletions

src/objective-c/tests/RemoteTestClient/empty.proto
src/objective-c/tests/RemoteTestClient/test.proto 2 additions, 2 deletions

src/objective-c/tests/RemoteTestClient/test.proto

with 32 additions and 56 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