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

c1c691fd

Commit c1c691fd authored 8 years ago by Craig Tiller

Downloads
- Patches
- Plain Diff

Fix merge error

parent 344834b4

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 3 additions, 3 deletions

Makefile
build.yaml 3 additions, 0 deletions

build.yaml
tools/run_tests/sources_and_headers.json 4 additions, 1 deletion

tools/run_tests/sources_and_headers.json
vsprojects/buildtests_c.sln 4 additions, 0 deletions

vsprojects/buildtests_c.sln
vsprojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj 8 additions, 0 deletions

...ojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj

with 22 additions and 4 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