| Commit message (Expand) | Author | Age | Files | Lines |
* | merging | Gennadiy Civil | 2018-04-11 | 1 | -2/+2 |
|
|
* | merging | Gennadiy Civil | 2018-04-10 | 1 | -1/+1 |
|
|
* | merging | Gennadiy Civil | 2018-04-10 | 1 | -3/+4 |
|
|
* | merge | Gennadiy Civil | 2018-04-10 | 1 | -4/+3 |
|\ |
|
| * | Revert "gmock actions 2"refs/pull/1556/head | Gennadiy Civil | 2018-04-10 | 1 | -13/+0 |
|
|
| * | this should be it | Gennadiy Civil | 2018-04-09 | 1 | -4/+0 |
|
|
| * | yet more | Gennadiy Civil | 2018-04-09 | 1 | -3/+3 |
|
|
| * | formatting | Gennadiy Civil | 2018-04-09 | 1 | -1/+3 |
|
|
| * | more | Gennadiy Civil | 2018-04-09 | 1 | -6/+9 |
|
|
* | | RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors... | Gennadiy Civil | 2018-04-10 | 1 | -3/+4 |
|/ |
|
* | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+1 |
|
|
* | more MSVC warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+11 |
|
|
* | Merge branch 'master' into fix_locale_winrefs/pull/1543/head | Gennadiy Civil | 2018-04-04 | 1 | -1/+3 |
|\ |
|
| * | Tweaking https://github.com/google/googletest/pull/1523 to exclude naclrefs/pull/1542/head | Gennadiy Civil | 2018-04-04 | 1 | -1/+3 |
|
|
* | | fix build break on locale windows | fo40225 | 2018-04-04 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'master' into int3refs/pull/1523/head | Gennadiy Civil | 2018-04-03 | 1 | -1/+1 |
|\ |
|
| * | Upstreaming, cl 191344765 | Gennadiy Civil | 2018-04-03 | 1 | -1/+1 |
|
|
* | | Merge branch 'master' into int3 | Gennadiy Civil | 2018-04-03 | 1 | -19/+5 |
|\ \
| |/ |
|
| * | merging port, cont. 191443078refs/pull/1539/head | Gennadiy Civil | 2018-04-03 | 1 | -3/+5 |
|
|
| * | merging, cont - 2 | Gennadiy Civil | 2018-04-03 | 1 | -16/+0 |
|
|
* | | Merge branch 'master' into int3 | Gennadiy Civil | 2018-04-03 | 1 | -10/+22 |
|\ \
| |/ |
|
| * | merging gtest-port.h , 191439094 | Gennadiy Civil | 2018-04-03 | 1 | -4/+7 |
|
|
| * | merging, just comments formatrefs/pull/1537/head | Gennadiy Civil | 2018-04-03 | 1 | -1/+3 |
|
|
| * | testing, merge | Gennadiy Civil | 2018-04-03 | 1 | -1/+1 |
|
|
| * | Testing, gtest-port.h merge | Gennadiy Civil | 2018-04-03 | 1 | -0/+3 |
|
|
| * | merging gtest-port.h, again - 1refs/pull/1534/head | Gennadiy Civil | 2018-04-02 | 1 | -5/+9 |
|
|
* | | Merge branch 'master' into int3 | Roland Leißa | 2018-03-30 | 1 | -23/+46 |
|\ \
| |/ |
|
| * | Revert "merging gtest-port 1 of N"refs/pull/1527/head | Gennadiy Civil | 2018-03-29 | 1 | -14/+9 |
|
|
| * | Revert "merging gtest-port, 2"refs/pull/1526/head | Gennadiy Civil | 2018-03-29 | 1 | -9/+37 |
|
|
* | | Merge remote-tracking branch 'google/master' into int3 | Roland Leißa | 2018-03-29 | 1 | -37/+9 |
|\ \
| |/ |
|
| * | merging gtest-port, 2refs/pull/1525/head | Gennadiy Civil | 2018-03-29 | 1 | -37/+9 |
|
|
* | | typo | Roland Leißa | 2018-03-29 | 1 | -1/+1 |
|
|
* | | provide alternative for DebugBreak() | Roland Leißa | 2018-03-28 | 1 | -0/+3 |
|/ |
|
* | merging gtest-port 1 of Nrefs/pull/1518/head | Gennadiy Civil | 2018-03-27 | 1 | -9/+14 |
|
|
* | merges 1refs/pull/1515/head | Gennadiy Civil | 2018-03-26 | 1 | -3/+2 |
|
|
* | merges, gtest | Gennadiy Civil | 2018-03-26 | 4 | -13/+19 |
|
|
* | reverting gtest_list_tests_unittest.py | Gennadiy Civil | 2018-03-22 | 1 | -2/+2 |
|
|
* | more merges | Gennadiy Civil | 2018-03-22 | 1 | -2/+3 |
|
|
* | more merges | Gennadiy Civil | 2018-03-22 | 4 | -5/+5 |
|
|
* | More merges | Gennadiy Civil | 2018-03-21 | 3 | -28/+35 |
|
|
* | cl 189032107, againrefs/pull/1508/head | Gennadiy Civil | 2018-03-16 | 2 | -5/+19 |
|
|
* | cl 189032107 | Gennadiy Civil | 2018-03-16 | 1 | -17/+9 |
|
|
* | merge, again, IsRecursiveContainerrefs/pull/1507/head | Gennadiy Civil | 2018-03-15 | 4 | -20/+121 |
|
|
* | erging, contrefs/pull/1504/head | Gennadiy Civil | 2018-03-14 | 1 | -15/+4 |
|
|
* | merging, merging | Gennadiy Civil | 2018-03-13 | 2 | -39/+23 |
|
|
* | fixing, was removing too much | Gennadiy Civil | 2018-03-13 | 1 | -0/+37 |
|
|
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-13 | 4 | -8/+35 |
|\ |
|
| * | Merge branch 'master' into upstream_188748737refs/pull/1503/head | Bernhard Bauer | 2018-03-12 | 37 | -362/+2432 |
| |\ |
|
| * | | Allow macros inside of parametrized test names. | Bernhard Bauer | 2018-03-12 | 4 | -8/+35 |
|
|
* | | | More merges, removing old dead code | Gennadiy Civil | 2018-03-13 | 2 | -65/+6 |
| |/
|/| |
|