Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

Googletest
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

718fd88d

Unverified Commit 718fd88d authored 7 years ago by Gennadiy Civil Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #1429 from gennadiycivil/master

Code merges

parents cb727169 92c93802

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

googlemock/include/gmock/gmock-matchers.h 1 addition, 2 deletions

googlemock/include/gmock/gmock-matchers.h
googlemock/include/gmock/gmock-more-matchers.h 16 additions, 0 deletions

googlemock/include/gmock/gmock-more-matchers.h
googlemock/include/gmock/gmock-spec-builders.h 4 additions, 5 deletions

googlemock/include/gmock/gmock-spec-builders.h
googlemock/include/gmock/gmock.h 1 addition, 1 deletion

googlemock/include/gmock/gmock.h
googlemock/include/gmock/internal/gmock-generated-internal-utils.h 16 additions, 9 deletions

...k/include/gmock/internal/gmock-generated-internal-utils.h
googlemock/include/gmock/internal/gmock-internal-utils.h 36 additions, 3 deletions

googlemock/include/gmock/internal/gmock-internal-utils.h
googlemock/include/gmock/internal/gmock-port.h 7 additions, 11 deletions

googlemock/include/gmock/internal/gmock-port.h
googlemock/test/gmock_stress_test.cc 2 additions, 1 deletion

googlemock/test/gmock_stress_test.cc
googlemock/test/gmock_test.cc 3 additions, 2 deletions

googlemock/test/gmock_test.cc

with 86 additions and 34 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