Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into googletest_for_asam | duxiuxing | 2018-07-20 | 1 | -4/+8 |
|\ | |||||
| * | code sync | Gennadiy Civil | 2018-07-19 | 1 | -4/+8 |
* | | Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio | 杜修杏 | 2018-07-20 | 1 | -2/+2 |
* | | Merge branch 'master' into googletest_for_asam | duxiuxing | 2018-07-19 | 1 | -1/+1 |
|\| | |||||
| * | Formatting and a link | Gennadiy Civil | 2018-07-18 | 1 | -1/+1 |
* | | Fix warning C4819: The file contains a character that cannot be represented i... | duxiuxing | 2018-07-17 | 3 | -21/+21 |
|/ | |||||
* | Fix gmock not building when -fno-rtti | Scott Graham | 2018-05-02 | 1 | -4/+4 |
* | merging, | Gennadiy Civil | 2018-04-25 | 5 | -480/+803 |
* | 193353312 | Gennadiy Civil | 2018-04-18 | 1 | -4/+7 |
* | http://cl/193060888 | Gennadiy Civil | 2018-04-17 | 1 | -5/+13 |
* | test-meerging | Gennadiy Civil | 2018-04-16 | 2 | -34/+6 |
* | merging gmock generated matchers | Gennadiy Civil | 2018-04-16 | 2 | -264/+367 |
* | merging | Gennadiy Civil | 2018-04-12 | 2 | -0/+20 |
* | merging | Gennadiy Civil | 2018-04-12 | 1 | -18/+14 |
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-12 | 3 | -210/+203 |
|\ | |||||
| * | Remove multiple inheritance from "unintesting call" mock classes. | Victor Costan | 2018-04-12 | 3 | -210/+203 |
* | | small cleanup | Gennadiy Civil | 2018-04-12 | 1 | -0/+8 |
|/ | |||||
* | merging | Gennadiy Civil | 2018-04-11 | 1 | -17/+73 |
* | Upstream cl/192179348 | Gennadiy Civil | 2018-04-11 | 1 | -2/+4 |
* | ..and this should be it | Gennadiy Civil | 2018-04-11 | 1 | -1/+15 |
* | merge | Gennadiy Civil | 2018-04-10 | 3 | -96/+18 |
|\ | |||||
| * | Revert "gmock actions 2" | Gennadiy Civil | 2018-04-09 | 8 | -105/+25 |
| * | yet more | Gennadiy Civil | 2018-04-09 | 1 | -1/+1 |
| * | continued | Gennadiy Civil | 2018-04-09 | 4 | -6/+8 |
* | | RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors... | Gennadiy Civil | 2018-04-10 | 5 | -77/+310 |
|/ | |||||
* | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-09 | 1 | -30/+60 |
|\ | |||||
| * | Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. | Victor Costan | 2018-04-06 | 1 | -30/+60 |
* | | linkage, fixing MSVC | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
* | | fixing MSVC | Gennadiy Civil | 2018-04-06 | 1 | -0/+2 |
* | | warnings | Gennadiy Civil | 2018-04-06 | 1 | -1/+2 |
* | | cont - 2 | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
* | | cont | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
* | | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 |
* | | deal with MSVC warn, cont 1 | Gennadiy Civil | 2018-04-06 | 1 | -2/+1 |
* | | Cont. deal with MCVS warnings | Gennadiy Civil | 2018-04-06 | 2 | -2/+16 |
* | | Deal with MCVS warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+6 |
* | | merging gmock-actions 2 | Gennadiy Civil | 2018-04-06 | 1 | -17/+73 |
|/ | |||||
* | Merging gMock, 2 | Gennadiy Civil | 2018-04-05 | 4 | -375/+479 |
* | formatting | Gennadiy Civil | 2018-04-05 | 1 | -2/+2 |
* | And more MCVS warnings | Gennadiy Civil | 2018-04-05 | 1 | -5/+4 |
* | fixing MCVS warn | Gennadiy Civil | 2018-04-05 | 1 | -0/+10 |
* | merging gmock matchers 1 | Gennadiy Civil | 2018-04-04 | 1 | -29/+169 |
* | merging gmock-matchers.h 3 | Gennadiy Civil | 2018-03-26 | 1 | -13/+36 |
* | merging gmock-matchers.h 2 | Gennadiy Civil | 2018-03-26 | 1 | -7/+44 |
* | Upstreaming FloatingEq2Matcher, | Gennadiy Civil | 2018-03-26 | 1 | -9/+13 |
* | Merging gmock-matchers.h -2 | Gennadiy Civil | 2018-03-23 | 1 | -29/+208 |
* | gmock-matchers merging -2 | Gennadiy Civil | 2018-03-23 | 1 | -10/+250 |
* | merging, gmock -1 | Gennadiy Civil | 2018-03-22 | 1 | -24/+45 |
* | More merges, removing old dead code | Gennadiy Civil | 2018-03-13 | 1 | -5/+6 |
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 1 | -0/+2 |
|\ |