| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge pull request #1561 from gennadiycivil/master | Gennadiy Civil | 2018-04-11 | 2 | -18/+74 | |
| |\ \ | | | | | | | Merging gmock-actions | |||||
| | | * | small cleanup | Gennadiy Civil | 2018-04-12 | 2 | -1/+15 | |
| | |/ | ||||||
| | * | ...merging | Gennadiy Civil | 2018-04-11 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-11 | 0 | -0/+0 | |
| | |\ | |/ |/| | ||||||
| * | | Merge pull request #1560 from gennadiycivil/master | Gennadiy Civil | 2018-04-11 | 1 | -2/+4 | |
| |\ \ | | | | | | | Upstream cl/192179348 | |||||
| | | * | merging | Gennadiy Civil | 2018-04-11 | 1 | -17/+73 | |
| | |/ | ||||||
| | * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-11 | 0 | -0/+0 | |
| | |\ | |/ |/| | ||||||
| * | | Merge pull request #1559 from gennadiycivil/master | Gennadiy Civil | 2018-04-11 | 1 | -2/+2 | |
| |\ \ | | | | | | | Upstream cl 191754725 | |||||
| | | * | Upstream cl/192179348 | Gennadiy Civil | 2018-04-11 | 1 | -2/+4 | |
| | |/ | ||||||
| | * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-11 | 0 | -0/+0 | |
| | |\ | |/ |/| | ||||||
| * | | Merge pull request #1558 from gennadiycivil/master | Gennadiy Civil | 2018-04-11 | 12 | -85/+388 | |
| |\ \ | | | | | | | RE-Doing the merge, this time with gcc on mac in the PR | |||||
| | | * | merging | Gennadiy Civil | 2018-04-11 | 1 | -2/+2 | |
| | |/ | ||||||
| | * | ..and this should be it | Gennadiy Civil | 2018-04-11 | 1 | -1/+15 | |
| | | | ||||||
| | * | more | Gennadiy Civil | 2018-04-11 | 1 | -1/+1 | |
| | | | ||||||
| | * | pizza work, cont | Gennadiy Civil | 2018-04-11 | 1 | -1/+2 | |
| | | | ||||||
| | * | osx pizzas, cont | Gennadiy Civil | 2018-04-11 | 1 | -1/+2 | |
| | | | ||||||
| | * | fixing osx pizza | Gennadiy Civil | 2018-04-11 | 1 | -1/+2 | |
| | | | ||||||
| | * | merging | Gennadiy Civil | 2018-04-10 | 1 | -1/+1 | |
| | | | ||||||
| | * | merging | Gennadiy Civil | 2018-04-10 | 2 | -6/+9 | |
| | | | ||||||
| | * | merging | Gennadiy Civil | 2018-04-10 | 1 | -7/+10 | |
| | | | ||||||
| | * | merge | Gennadiy Civil | 2018-04-10 | 9 | -260/+33 | |
| | |\ | |/ |/| | ||||||
| * | | Include gcc on mac into PR matrix | Gennadiy Civil | 2018-04-10 | 1 | -1/+0 | |
| | | | | | | | There was an error that slipped through and only showed up on PR merge (https://travis-ci.org/google/googletest/jobs/364304396/config ) , we dont want that again | |||||
| * | | Merge pull request #1556 from google/revert-1551-master | Gennadiy Civil | 2018-04-09 | 13 | -303/+27 | |
| |\ \ | | | | | | | Revert "gmock actions 2" | |||||
| | * | | Revert "gmock actions 2" | Gennadiy Civil | 2018-04-09 | 13 | -303/+27 | |
| |/ / | ||||||
| * | | Merge pull request #1551 from gennadiycivil/master | Gennadiy Civil | 2018-04-09 | 13 | -27/+303 | |
| |\ \ | | | | | | | gmock actions 2 | |||||
| | * | | ... and this | Gennadiy Civil | 2018-04-09 | 1 | -8/+4 | |
| | | | | ||||||
| | * | | this should be it | Gennadiy Civil | 2018-04-09 | 1 | -4/+0 | |
| | | | | ||||||
| | * | | yet more | Gennadiy Civil | 2018-04-09 | 2 | -4/+4 | |
| | | | | ||||||
| | * | | formatting | Gennadiy Civil | 2018-04-09 | 4 | -4/+7 | |
| | | | | ||||||
| | * | | tuning | Gennadiy Civil | 2018-04-09 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | tuning | Gennadiy Civil | 2018-04-09 | 1 | -3/+7 | |
| | | | | ||||||
| | * | | more | Gennadiy Civil | 2018-04-09 | 1 | -6/+9 | |
| | | | | ||||||
| | * | | cont | Gennadiy Civil | 2018-04-09 | 1 | -3/+0 | |
| | | | | ||||||
| | * | | msvc | Gennadiy Civil | 2018-04-09 | 2 | -12/+13 | |
| | | | | ||||||
| | * | | more msvc | Gennadiy Civil | 2018-04-09 | 2 | -16/+15 | |
| | | | | ||||||
| | * | | msvc 14 | Gennadiy Civil | 2018-04-09 | 2 | -14/+16 | |
| | | | | ||||||
| | * | | testing msvc again | Gennadiy Civil | 2018-04-09 | 2 | -16/+14 | |
| | | | | ||||||
| | * | | More msvc 14 | Gennadiy Civil | 2018-04-09 | 1 | -0/+16 | |
| | | | | ||||||
| | * | | And also silence for MSVS14 | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | preproc syntax ( I can never remember it) | Gennadiy Civil | 2018-04-09 | 1 | -5/+9 | |
| | | | | ||||||
| | * | | syntax | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | 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 | 10 | -96/+346 | |
| | |/ | | | | | | | errors before merging the PR | |||||
| | * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-09 | 1 | -30/+60 | |
| | |\ | |/ |/| | ||||||
| * | | Merge pull request #1552 from pwnall/mock-pump | Gennadiy Civil | 2018-04-09 | 1 | -30/+60 | |
| |\ \ | | | | | | | Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h | |||||
| | * | | 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 | |
| | | | ||||||
 |
index : avr/qmk/googletest | |
| [no description] |
| aboutsummaryrefslogtreecommitdiffstats |