aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include
Commit message (Expand)AuthorAgeFilesLines
...
| | * | code syncGennadiy Civil2018-07-191-4/+8
| * | | Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio杜修杏2018-07-201-2/+2
| * | | Merge branch 'master' into googletest_for_asamduxiuxing2018-07-191-1/+1
| |\| |
| * | | Fix warning C4819: The file contains a character that cannot be represented i...duxiuxing2018-07-173-21/+21
* | | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-191-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Formatting and a linkGennadiy Civil2018-07-181-1/+1
| |/ /
* / / This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.Masaru Tsuchiyama2018-06-302-8/+8
|/ /
* | Fix gmock not building when -fno-rttiScott Graham2018-05-021-4/+4
* | merging, Gennadiy Civil2018-04-255-480/+803
* | 193353312Gennadiy Civil2018-04-181-4/+7
* | http://cl/193060888Gennadiy Civil2018-04-171-5/+13
* | test-meergingGennadiy Civil2018-04-162-34/+6
* | merging gmock generated matchersGennadiy Civil2018-04-162-264/+367
* | merging Gennadiy Civil2018-04-122-0/+20
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 03:48:32 +0000