| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | ..and this should be it | Gennadiy Civil | 2018-04-11 | 1 | -1/+15 |
| | | |||||
| * | merge | Gennadiy Civil | 2018-04-10 | 3 | -96/+18 |
| |\ | |||||
| | * | Revert "gmock actions 2" | Gennadiy Civil | 2018-04-09 | 8 | -105/+25 |
| | | | |||||
| | * | yet more | Gennadiy Civil | 2018-04-09 | 1 | -1/+1 |
| | | | |||||
| | * | continued | Gennadiy Civil | 2018-04-09 | 4 | -6/+8 |
| | | | |||||
| * | | RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵ | Gennadiy Civil | 2018-04-10 | 5 | -77/+310 |
| |/ | | | | errors before merging the PR | ||||
| * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-09 | 1 | -30/+60 |
| |\ | |||||
| | * | Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. | Victor Costan | 2018-04-06 | 1 | -30/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71 published the changes in internal CL 156157936, but missed the diff in gmock-generated-nice-strict.h.pump. This makes it difficult to reason about the change, because the .pump file is more concise than the generated file. This PR was tested by re-generating the .h file using the command below and checking the git diff. ./googletest/scripts/pump.py \ googlemock/include/gmock/gmock-generated-nice-strict.h.pump | ||||
| * | | linkage, fixing MSVC | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | | |||||
| * | | fixing MSVC | Gennadiy Civil | 2018-04-06 | 1 | -0/+2 |
| | | | |||||
| * | | warnings | Gennadiy Civil | 2018-04-06 | 1 | -1/+2 |
| | | | |||||
| * | | cont - 2 | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | | |||||
| * | | cont | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | | |||||
| * | | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
| | | | |||||
| * | | deal with MSVC warn, cont 1 | Gennadiy Civil | 2018-04-06 | 1 | -2/+1 |
| | | | |||||
| * | | Cont. deal with MCVS warnings | Gennadiy Civil | 2018-04-06 | 2 | -2/+16 |
| | | | |||||
| * | | Deal with MCVS warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+6 |
| | | | |||||
| * | | merging gmock-actions 2 | Gennadiy Civil | 2018-04-06 | 1 | -17/+73 |
| |/ | |||||
| * | Merging gMock, 2 | Gennadiy Civil | 2018-04-05 | 4 | -375/+479 |
| | | |||||
| * | formatting | Gennadiy Civil | 2018-04-05 | 1 | -2/+2 |
| | | |||||
| * | And more MCVS warnings | Gennadiy Civil | 2018-04-05 | 1 | -5/+4 |
| | | |||||
| * | fixing MCVS warn | Gennadiy Civil | 2018-04-05 | 1 | -0/+10 |
| | | |||||
| * | merging gmock matchers 1 | Gennadiy Civil | 2018-04-04 | 1 | -29/+169 |
| | | |||||
| * | merging gmock-matchers.h 3 | Gennadiy Civil | 2018-03-26 | 1 | -13/+36 |
| | | |||||
| * | merging gmock-matchers.h 2 | Gennadiy Civil | 2018-03-26 | 1 | -7/+44 |
| | | |||||
| * | Upstreaming FloatingEq2Matcher, | Gennadiy Civil | 2018-03-26 | 1 | -9/+13 |
| | | |||||
| * | Merging gmock-matchers.h -2 | Gennadiy Civil | 2018-03-23 | 1 | -29/+208 |
| | | |||||
| * | gmock-matchers merging -2 | Gennadiy Civil | 2018-03-23 | 1 | -10/+250 |
| | | |||||
| * | merging, gmock -1 | Gennadiy Civil | 2018-03-22 | 1 | -24/+45 |
| | | |||||
| * | More merges, removing old dead code | Gennadiy Civil | 2018-03-13 | 1 | -5/+6 |
| | | |||||
| * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 1 | -0/+2 |
| |\ | |||||
| | * | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-03-01 | 1 | -44/+258 |
| | |\ | |||||
| | * | | Try to handle unsigned wchar_t (arm) a bit better | Scott Graham | 2018-02-23 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merges-1 | Gennadiy Civil | 2018-03-05 | 1 | -4/+3 |
| | |/ |/| | |||||
| * | | Merge branch 'master' into variant_matcher | Xiaoyi Zhang | 2018-02-27 | 1 | -44/+187 |
| |\ \ | |||||
| | * | | gmock merging -2 | Gennadiy Civil | 2018-02-27 | 1 | -44/+187 |
| | |/ | |||||
| * / | Add matcher for std::variant. | Xiaoyi Zhang | 2018-02-27 | 1 | -0/+71 |
| |/ | |||||
| * | moving JoinAsTuple to internal | Gennadiy Civil | 2018-02-12 | 1 | -4/+0 |
| | | |||||
| * | Fixed typos | Troy Holsapple | 2018-02-07 | 1 | -2/+2 |
| | | |||||
| * | Code merges | Gennadiy Civil | 2018-01-26 | 7 | -31/+81 |
| | | |||||
| * | Pass the -Wmissing-declarations warning. | David Benjamin | 2018-01-03 | 1 | -0/+4 |
| | | | | | | | This makes it easier to use GTest in projects that build with the -Wmissing-declarations warning. This fixes the warning in headers and source files, though not GTest's own tests as it is rather noisy there. | ||||
| * | Remove gcc 6 misleading indentations. | Romain Geissler | 2017-10-25 | 2 | -13/+26 |
| | | |||||
| * | Use gender-neutral pronouns in comments and docs | Jonathan Wakely | 2017-09-27 | 1 | -1/+1 |
| | | |||||
| * | change links from former code.google.com to current github repository | Herbert Thielen | 2017-08-31 | 4 | -4/+4 |
| | | |||||
| * | Merge branch 'refs/heads/master' into flag-default | Alyssa Wilk | 2017-08-28 | 1 | -8/+27 |
| |\ | |||||
| | * | Support ref-qualified member functions in Property(). | Roman Perepelitsa | 2017-08-22 | 1 | -8/+27 |
| | | | |||||
| * | | Adding a flag option to change the default mock type | Alyssa Wilk | 2017-08-10 | 2 | -1/+1 |
| |/ | |||||
| * | Merge pull request #1123 from chromy/upstream-141765019 | Gennadiy Civil | 2017-08-08 | 1 | -4/+4 |
| |\ | | | | | Fix typo in gmock-actions.h | ||||
| | * | Fix typo in gmock-actions.h | Hector Dearman | 2017-06-19 | 1 | -4/+4 |
| | | | | | | | | | This upstreams a Google-internal change (141765019). | ||||
| * | | Fixed misspelling in assertion message. | Hector Dearman | 2017-06-19 | 1 | -1/+1 |
| |/ | | | | This upstreams a Google-internal change (146491438). | ||||
 |
index : avr/qmk/googletest | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |