aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Expand)AuthorAgeFilesLines
...
| * | | osx pizzasGennadiy Civil2018-04-131-2/+3
| * | | merging gmock actions test Gennadiy Civil2018-04-131-0/+1
| * | | merging, gmock actions test Gennadiy Civil2018-04-131-1/+142
| * | | mergingGennadiy Civil2018-04-132-10/+13
| * | | more fixing osx libstd++ bugsGennadiy Civil2018-04-121-1/+2
| * | | fixing Gennadiy Civil2018-04-121-0/+1
| * | | merging, fix OSX issueGennadiy Civil2018-04-122-2/+2
| * | | mergingGennadiy Civil2018-04-122-10/+8
| * | | merging Gennadiy Civil2018-04-123-3/+67
| * | | merging Gennadiy Civil2018-04-122-18/+37
| * | | msvcGennadiy Civil2018-04-121-2/+2
| * | | revert this oneGennadiy Civil2018-04-121-1/+1
| * | | merge, ... gmock-matchers testGennadiy Civil2018-04-121-3/+3
| * | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-124-210/+224
| |\ \ \
| | * | | Remove multiple inheritance from "unintesting call" mock classes.Victor Costan2018-04-124-210/+224
| * | | | small cleanupGennadiy Civil2018-04-122-1/+15
| |/ / /
| * | | ...mergingGennadiy Civil2018-04-111-1/+1
| * | | mergingGennadiy Civil2018-04-111-17/+73
| * | | Upstream cl/192179348Gennadiy Civil2018-04-111-2/+4
| * | | ..and this should be itGennadiy Civil2018-04-111-1/+15
| * | | moreGennadiy Civil2018-04-111-1/+1
| * | | pizza work, contGennadiy Civil2018-04-111-1/+2
| * | | osx pizzas, contGennadiy Civil2018-04-111-1/+2
| * | | fixing osx pizzaGennadiy Civil2018-04-111-1/+2
| * | | 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 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