aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Expand)AuthorAgeFilesLines
...
| * 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 errors...Gennadiy Civil2018-04-109-93/+342
|/
* 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
* | 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
* merging gmock-matchers.h 2Gennadiy Civil2018-03-261-7/+44
* Upstreaming FloatingEq2Matcher,Gennadiy Civil2018-03-261-9/+13
* Merging gmock-matchers.h -2 Gennadiy Civil2018-03-231-29/+208
* gmock-matchers merging -2 Gennadiy Civil2018-03-231-10/+250
* merging, gmock -1Gennadiy Civil2018-03-224-60/+120
* More merges, removing old dead codeGennadiy Civil2018-03-132-7/+8
* merges-2Gennadiy Civil2018-03-052-4/+14
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-052-0/+6
|\
| * Merge branch 'master' into unsigned-wcharGennadiy Civil2018-03-015-123/+465
| |\
| * | Try to handle unsigned wchar_t (arm) a bit betterScott Graham2018-02-232-0/+6
* | | Merges-1Gennadiy Civil2018-03-052-4/+5
| |/ |/|
* | Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest in...Xiaoyi Zhang2018-02-273-123/+328
|\ \
| * \ Merge branch 'master' into variant_matcherXiaoyi Zhang2018-02-273-123/+328
| |\ \
| | * | gmock merging -2Gennadiy Civil2018-02-273-123/+328
| | |/
* | / Add documentation for VariantWith.Xiaoyi Zhang2018-02-271-0/+2
|/ /
* / Add matcher for std::variant.Xiaoyi Zhang2018-02-272-0/+135
|/
* moving JoinAsTuple to internalGennadiy Civil2018-02-124-49/+22
* Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-095-13/+13
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 16:23:43 +0000