aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* mergingGennadiy Civil2018-04-101-3/+5
|
* mergingGennadiy Civil2018-04-101-7/+10
|
* mergeGennadiy Civil2018-04-107-255/+30
|\
| * Revert "gmock actions 2"Gennadiy Civil2018-04-0912-290/+27
| |
| * ... and thisGennadiy Civil2018-04-091-8/+4
| |
| * yet moreGennadiy Civil2018-04-091-1/+1
| |
| * formattingGennadiy Civil2018-04-093-3/+4
| |
| * tuningGennadiy Civil2018-04-091-1/+1
| |
| * tuningGennadiy Civil2018-04-091-3/+7
| |
| * contGennadiy Civil2018-04-091-3/+0
| |
| * msvcGennadiy Civil2018-04-092-12/+13
| |
| * more msvcGennadiy Civil2018-04-092-16/+15
| |
| * msvc 14Gennadiy Civil2018-04-092-14/+16
| |
| * testing msvc againGennadiy Civil2018-04-092-16/+14
| |
| * More msvc 14 Gennadiy Civil2018-04-091-0/+16
| |
| * And also silence for MSVS14Gennadiy Civil2018-04-091-2/+2
| |
| * preproc syntax ( I can never remember it)Gennadiy Civil2018-04-091-5/+9
| |
| * syntaxGennadiy Civil2018-04-091-2/+2
| |
| * cont.Gennadiy Civil2018-04-091-2/+2
| |
| * continuedGennadiy Civil2018-04-095-7/+8
| |
* | RE-Doing the merge, this time with gcc on mac in the PR so I can catch ↵Gennadiy Civil2018-04-109-93/+342
|/ | | | errors before merging the PR
* Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-091-30/+60
|\
| * Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.Victor Costan2018-04-061-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 fixingGennadiy Civil2018-04-061-0/+12
| |
* | linkage, fixing MSVCGennadiy Civil2018-04-061-1/+1
| |
* | fixing MSVCGennadiy Civil2018-04-062-1/+3
| |
* | more warningsGennadiy Civil2018-04-061-0/+12
| |
* | warningsGennadiy Civil2018-04-061-1/+2
| |
* | cont - 2Gennadiy Civil2018-04-061-1/+1
| |
* | contGennadiy Civil2018-04-061-1/+1
| |
* | more warningsGennadiy Civil2018-04-061-1/+1
| |
* | deal with MSVC warn, cont 1Gennadiy Civil2018-04-061-2/+1
| |
* | Cont. deal with MCVS warningsGennadiy Civil2018-04-062-2/+16
| |
* | Deal with MCVS warningsGennadiy Civil2018-04-061-0/+6
| |
* | merging gmock-actions 2Gennadiy Civil2018-04-062-18/+216
|/
* Merging gMock, 2Gennadiy Civil2018-04-059-420/+573
|
* formattingGennadiy Civil2018-04-051-2/+2
|
* And more MCVS warningsGennadiy Civil2018-04-051-5/+4
|
* fixing MCVS warnGennadiy Civil2018-04-051-0/+10
|
* Have to wait for this oneGennadiy Civil2018-04-051-2/+2
|
* Have to wait for this oneGennadiy Civil2018-04-051-1/+1
|
* Merging matchers testGennadiy Civil2018-04-051-0/+3
|
* Merging matchers testGennadiy Civil2018-04-051-40/+779
|
* bad cut/pasteGennadiy Civil2018-04-041-1/+1
|
* More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-2/+6
|
* More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-1/+1
|
* Address MSVC warning C4503, decorated name length exceeded, name was truncatedGennadiy Civil2018-04-041-0/+2
|
* Fixing build break on MSVCGennadiy Civil2018-04-041-1/+1
|
* merging gmock matchers 1Gennadiy Civil2018-04-043-72/+483
|
* merging gmock-matchers.h 3Gennadiy Civil2018-03-261-13/+36
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 22:51:54 +0000