| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | cont. | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 | |
| | | | ||||||
| | * | continued | Gennadiy Civil | 2018-04-09 | 5 | -7/+8 | |
| | | | ||||||
| * | | RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵ | Gennadiy Civil | 2018-04-10 | 9 | -93/+342 | |
| |/ | | | | 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 | |||||
| * | | more mcvs fixing | Gennadiy Civil | 2018-04-06 | 1 | -0/+12 | |
| | | | ||||||
| * | | linkage, fixing MSVC | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | fixing MSVC | Gennadiy Civil | 2018-04-06 | 2 | -1/+3 | |
| | | | ||||||
| * | | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+12 | |
| | | | ||||||
| * | | 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 | 2 | -18/+216 | |
| |/ | ||||||
| * | Merging gMock, 2 | Gennadiy Civil | 2018-04-05 | 9 | -420/+573 | |
| | | ||||||
| * | 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 | |
| | | ||||||
| * | Have to wait for this one | Gennadiy Civil | 2018-04-05 | 1 | -2/+2 | |
| | | ||||||
| * | Have to wait for this one | Gennadiy Civil | 2018-04-05 | 1 | -1/+1 | |
| | | ||||||
| * | Merging matchers test | Gennadiy Civil | 2018-04-05 | 1 | -0/+3 | |
| | | ||||||
| * | Merging matchers test | Gennadiy Civil | 2018-04-05 | 1 | -40/+779 | |
| | | ||||||
| * | bad cut/paste | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
| | | ||||||
| * | More on MSVC warning C4503, decorated name length exceeded | Gennadiy Civil | 2018-04-04 | 1 | -2/+6 | |
| | | ||||||
| * | More on MSVC warning C4503, decorated name length exceeded | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
| | | ||||||
| * | Address MSVC warning C4503, decorated name length exceeded, name was truncated | Gennadiy Civil | 2018-04-04 | 1 | -0/+2 | |
| | | ||||||
| * | Fixing build break on MSVC | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
| | | ||||||
| * | merging gmock matchers 1 | Gennadiy Civil | 2018-04-04 | 3 | -72/+483 | |
| | | ||||||
| * | 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 | 4 | -60/+120 | |
| | | ||||||
| * | More merges, removing old dead code | Gennadiy Civil | 2018-03-13 | 2 | -7/+8 | |
| | | ||||||
| * | merges-2 | Gennadiy Civil | 2018-03-05 | 2 | -4/+14 | |
| | | ||||||
| * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 2 | -0/+6 | |
| |\ | ||||||
| | * | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-03-01 | 5 | -123/+465 | |
| | |\ | ||||||
| | * | | Try to handle unsigned wchar_t (arm) a bit better | Scott Graham | 2018-02-23 | 2 | -0/+6 | |
| | | | | ||||||
| * | | | Merges-1 | Gennadiy Civil | 2018-03-05 | 2 | -4/+5 | |
| | |/ |/| | ||||||
| * | | Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest ↵ | Xiaoyi Zhang | 2018-02-27 | 3 | -123/+328 | |
| |\ \ | | | | | | | | | | into variant_matcher | |||||
| | * \ | Merge branch 'master' into variant_matcher | Xiaoyi Zhang | 2018-02-27 | 3 | -123/+328 | |
| | |\ \ | ||||||
| | | * | | gmock merging -2 | Gennadiy Civil | 2018-02-27 | 3 | -123/+328 | |
| | | |/ | ||||||
| * | / | Add documentation for VariantWith. | Xiaoyi Zhang | 2018-02-27 | 1 | -0/+2 | |
| |/ / | ||||||
| * / | Add matcher for std::variant. | Xiaoyi Zhang | 2018-02-27 | 2 | -0/+135 | |
| |/ | ||||||
| * | moving JoinAsTuple to internal | Gennadiy Civil | 2018-02-12 | 4 | -49/+22 | |
| | | ||||||
| * | Merge pull request #1446 from tholsapp/master | Gennadiy Civil | 2018-02-09 | 5 | -13/+13 | |
| |\ | | | | | Fixed typos | |||||
 |
index : avr/qmk/googletest | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/googlemock