Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | merging, fix OSX issue | Gennadiy Civil | 2018-04-12 | 2 | -2/+2 | |
* | merging | Gennadiy Civil | 2018-04-12 | 2 | -10/+8 | |
* | merging refs/pull/1567/head | Gennadiy Civil | 2018-04-12 | 3 | -3/+67 | |
* | merging refs/pull/1566/head | Gennadiy Civil | 2018-04-12 | 2 | -18/+37 | |
* | msvcrefs/pull/1562/head | Gennadiy Civil | 2018-04-12 | 1 | -2/+2 | |
* | revert this one | Gennadiy Civil | 2018-04-12 | 1 | -1/+1 | |
* | merge, ... gmock-matchers test | Gennadiy Civil | 2018-04-12 | 1 | -3/+3 | |
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-12 | 4 | -210/+224 | |
|\ | ||||||
| * | Remove multiple inheritance from "unintesting call" mock classes.refs/pull/1557/head | Victor Costan | 2018-04-12 | 4 | -210/+224 | |
* | | small cleanup | Gennadiy Civil | 2018-04-12 | 2 | -1/+15 | |
|/ | ||||||
* | ...mergingrefs/pull/1561/head | Gennadiy Civil | 2018-04-11 | 1 | -1/+1 | |
* | merging | Gennadiy Civil | 2018-04-11 | 1 | -17/+73 | |
* | Upstream cl/192179348 | Gennadiy Civil | 2018-04-11 | 1 | -2/+4 | |
* | ..and this should be itrefs/pull/1558/head | Gennadiy Civil | 2018-04-11 | 1 | -1/+15 | |
* | more | Gennadiy Civil | 2018-04-11 | 1 | -1/+1 | |
* | pizza work, cont | Gennadiy Civil | 2018-04-11 | 1 | -1/+2 | |
* | osx pizzas, cont | Gennadiy Civil | 2018-04-11 | 1 | -1/+2 | |
* | fixing osx pizza | Gennadiy Civil | 2018-04-11 | 1 | -1/+2 | |
* | merging | Gennadiy Civil | 2018-04-10 | 1 | -3/+5 | |
* | merging | Gennadiy Civil | 2018-04-10 | 1 | -7/+10 | |
* | merge | Gennadiy Civil | 2018-04-10 | 7 | -255/+30 | |
|\ | ||||||
| * | Revert "gmock actions 2"refs/pull/1556/head | Gennadiy Civil | 2018-04-10 | 12 | -290/+27 | |
| * | ... and thisrefs/pull/1551/head | Gennadiy Civil | 2018-04-09 | 1 | -8/+4 | |
| * | yet more | Gennadiy Civil | 2018-04-09 | 1 | -1/+1 | |
| * | formatting | Gennadiy Civil | 2018-04-09 | 3 | -3/+4 | |
| * | tuning | Gennadiy Civil | 2018-04-09 | 1 | -1/+1 | |
| * | tuning | Gennadiy Civil | 2018-04-09 | 1 | -3/+7 | |
| * | cont | Gennadiy Civil | 2018-04-09 | 1 | -3/+0 | |
| * | msvc | Gennadiy Civil | 2018-04-09 | 2 | -12/+13 | |
| * | more msvc | Gennadiy Civil | 2018-04-09 | 2 | -16/+15 | |
| * | msvc 14 | Gennadiy Civil | 2018-04-09 | 2 | -14/+16 | |
| * | testing msvc again | Gennadiy Civil | 2018-04-09 | 2 | -16/+14 | |
| * | More msvc 14 | Gennadiy Civil | 2018-04-09 | 1 | -0/+16 | |
| * | And also silence for MSVS14 | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 | |
| * | preproc syntax ( I can never remember it) | Gennadiy Civil | 2018-04-09 | 1 | -5/+9 | |
| * | syntax | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 | |
| * | cont. | Gennadiy Civil | 2018-04-09 | 1 | -2/+2 | |
| * | continued | Gennadiy Civil | 2018-04-09 | 5 | -7/+8 | |
* | | RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors... | Gennadiy Civil | 2018-04-10 | 9 | -93/+342 | |
|/ | ||||||
* | 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.refs/pull/1552/head | Victor Costan | 2018-04-07 | 1 | -30/+60 | |
* | | more mcvs fixing | Gennadiy Civil | 2018-04-06 | 1 | -0/+12 | |
* | | linkage, fixing MSVC | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 | |
* | | fixing MSVC | Gennadiy Civil | 2018-04-06 | 2 | -1/+3 | |
* | | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+12 | |
* | | 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 | |