aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock
Commit message (Expand)AuthorAgeFilesLines
...
* | merging Gennadiy Civil2018-04-121-18/+14
* | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-123-210/+203
|\ \
| * | Remove multiple inheritance from "unintesting call" mock classes.Victor Costan2018-04-123-210/+203
* | | small cleanupGennadiy Civil2018-04-121-0/+8
|/ /
* | mergingGennadiy Civil2018-04-111-17/+73
* | Upstream cl/192179348Gennadiy Civil2018-04-111-2/+4
* | ..and this should be itGennadiy Civil2018-04-111-1/+15
* | mergeGennadiy Civil2018-04-103-96/+18
|\ \
| * | Revert "gmock actions 2"Gennadiy Civil2018-04-098-105/+25
| * | yet moreGennadiy Civil2018-04-091-1/+1
| * | continuedGennadiy Civil2018-04-094-6/+8
* | | RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors...Gennadiy Civil2018-04-105-77/+310
|/ /
* | 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
* | | linkage, fixing MSVCGennadiy Civil2018-04-061-1/+1
* | | fixing MSVCGennadiy Civil2018-04-061-0/+2
* | | 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-061-17/+73
|/ /
* | Merging gMock, 2Gennadiy Civil2018-04-054-375/+479
* | formattingGennadiy Civil2018-04-051-2/+2
* | And more MCVS warningsGennadiy Civil2018-04-051-5/+4
* | fixing MCVS warnGennadiy Civil2018-04-051-0/+10
* | merging gmock matchers 1Gennadiy Civil2018-04-041-29/+169
* | 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-221-24/+45
* | More merges, removing old dead codeGennadiy Civil2018-03-131-5/+6
* | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-051-0/+2
|\ \
| * \ Merge branch 'master' into unsigned-wcharGennadiy Civil2018-03-011-44/+258
| |\ \
| * | | Try to handle unsigned wchar_t (arm) a bit betterScott Graham2018-02-231-0/+2
* | | | Merges-1Gennadiy Civil2018-03-051-4/+3
| |/ / |/| |
* | | Merge branch 'master' into variant_matcherXiaoyi Zhang2018-02-271-44/+187
|\ \ \
| * | | gmock merging -2Gennadiy Civil2018-02-271-44/+187
| |/ /
* / / Add matcher for std::variant.Xiaoyi Zhang2018-02-271-0/+71
|/ /
* | moving JoinAsTuple to internalGennadiy Civil2018-02-121-4/+0
* | Fixed typosTroy Holsapple2018-02-071-2/+2
* | Code mergesGennadiy Civil2018-01-267-31/+81
* | Pass the -Wmissing-declarations warning.David Benjamin2018-01-031-0/+4
* | Remove gcc 6 misleading indentations.Romain Geissler2017-10-252-13/+26
* | Use gender-neutral pronouns in comments and docsJonathan Wakely2017-09-271-1/+1
* | change links from former code.google.com to current github repositoryHerbert Thielen2017-08-314-4/+4