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

5b19054b

Unverified Commit 5b19054b authored 6 years ago by duxiuxing Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into googletest_for_asam

parents 65a49a73 1370e765

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 0 deletions

.gitignore
googlemock/include/gmock/internal/custom/gmock-matchers.h 1 addition, 1 deletion

googlemock/include/gmock/internal/custom/gmock-matchers.h
googlemock/test/gmock-actions_test.cc 0 additions, 202 deletions

googlemock/test/gmock-actions_test.cc
googlemock/test/gmock_ex_test.cc 2 additions, 1 deletion

googlemock/test/gmock_ex_test.cc
googletest/docs/advanced.md 1333 additions, 1213 deletions

googletest/docs/advanced.md
googletest/docs/faq.md 379 additions, 702 deletions

googletest/docs/faq.md
googletest/docs/primer.md 6 additions, 2 deletions

googletest/docs/primer.md
googletest/include/gtest/internal/gtest-port.h 1 addition, 1 deletion

googletest/include/gtest/internal/gtest-port.h

with 1725 additions and 2122 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