Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 pull request #1503 from sheepmaster/upstream_188748737 | Gennadiy Civil | 2018-03-12 | 4 | -8/+35 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into upstream_188748737 | Bernhard Bauer | 2018-03-12 | 64 | -620/+3159 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1502 from gennadiycivil/master | Gennadiy Civil | 2018-03-12 | 1 | -14/+22 | |
|\ \ \ | ||||||
| | * | | 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 | 4 | -72/+14 | |
| | |/ | |/| | ||||||
| * | | merges-port(1) | Gennadiy Civil | 2018-03-12 | 1 | -14/+22 | |
|/ / | ||||||
* | | Merge pull request #1497 from gennadiycivil/master | Gennadiy Civil | 2018-03-07 | 4 | -26/+114 | |
|\ \ | ||||||
| * | | Merging, XML tests | Gennadiy Civil | 2018-03-07 | 4 | -26/+114 | |
|/ / | ||||||
* | | Merge pull request #1493 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 3 | -27/+47 | |
|\ \ | ||||||
| * | | merges-8 | Gennadiy Civil | 2018-03-05 | 3 | -27/+47 | |
|/ / | ||||||
* | | Merge pull request #1492 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 1 | -25/+41 | |
|\ \ | ||||||
| * | | merges-7 | Gennadiy Civil | 2018-03-05 | 1 | -25/+41 | |
|/ / | ||||||
* | | Merge pull request #1491 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 5 | -7/+4 | |
|\ \ | ||||||
| * | | merges-6 | Gennadiy Civil | 2018-03-05 | 5 | -7/+4 | |
|/ / | ||||||
* | | Merge pull request #1490 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 1 | -1/+1 | |
|\ \ | ||||||
| * \ | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 0 | -0/+0 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1489 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 2 | -4/+14 | |
|\ \ \ | ||||||
| | * | | merges-3 | Gennadiy Civil | 2018-03-05 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 0 | -0/+0 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1488 from gennadiycivil/master | Gennadiy Civil | 2018-03-05 | 3 | -12/+17 | |
|\ \ \ | ||||||
| | * | | merges-2 | Gennadiy Civil | 2018-03-05 | 2 | -4/+14 | |
| |/ / | ||||||
| * | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 3 | -2/+8 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1477 from sgraham/unsigned-wchar | Gennadiy Civil | 2018-03-05 | 2 | -0/+6 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-03-05 | 1 | -2/+2 | |
| |\ \ \ | |/ / / |/| | | | ||||||
* | | | | Merge pull request #1486 from petrhosek/json-stacktrace | Gennadiy Civil | 2018-03-02 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Use a full message in the JSON output for failures | Petr Hosek | 2018-03-01 | 1 | -2/+2 | |
|/ / / / | ||||||
| * | | | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-03-01 | 14 | -139/+1880 | |
| |\ \ \ | |/ / / |/| | | | ||||||
| * | | | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-02-27 | 3 | -2/+16 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-02-26 | 2 | -22/+20 | |
| |\ \ \ \ | ||||||
| * | | | | | Try to handle unsigned wchar_t (arm) a bit better | Scott Graham | 2018-02-23 | 2 | -0/+6 | |
| | | | * | | Merges-1 | Gennadiy Civil | 2018-03-05 | 3 | -12/+17 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Merge pull request #1485 from coryan/parallelize-appveyor | Gennadiy Civil | 2018-02-28 | 1 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add options to parallelize builds. | Carlos O'Ryan | 2018-02-28 | 1 | -1/+2 | |
* | | | | | | Merge pull request #1479 from petrhosek/json | Gennadiy Civil | 2018-02-28 | 6 | -10/+1403 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Merge branch 'master' into json | Gennadiy Civil | 2018-02-28 | 2 | -2/+4 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #1481 from dneto0/debug-postfix | Gennadiy Civil | 2018-02-28 | 2 | -2/+4 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into debug-postfix | Gennadiy Civil | 2018-02-28 | 7 | -126/+471 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Merge branch 'master' into debug-postfix | Gennadiy Civil | 2018-02-27 | 3 | -2/+16 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | ||||||
| * | | | | | | Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX | David Neto | 2018-02-26 | 2 | -2/+4 | |
| | |_|_|/ / | |/| | | | | ||||||
| | | * | | | Support JSON output format in addition to XML | Petr Hosek | 2018-02-28 | 6 | -10/+1403 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #1482 from zhangxy988/variant_matcher | Gennadiy Civil | 2018-02-27 | 3 | -0/+137 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest in... | Xiaoyi Zhang | 2018-02-27 | 5 | -126/+334 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' into variant_matcher | Xiaoyi Zhang | 2018-02-27 | 5 | -126/+334 | |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #1483 from gennadiycivil/master | Gennadiy Civil | 2018-02-27 | 3 | -123/+328 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into master | Gennadiy Civil | 2018-02-27 | 2 | -3/+6 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #1423 from pcc/win-libcxx2 | Gennadiy Civil | 2018-02-27 | 2 | -3/+6 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into win-libcxx2 | Gennadiy Civil | 2018-02-27 | 52 | -354/+826 | |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| * | | | | | | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC. | Peter Collingbourne | 2018-01-25 | 1 | -2/+5 |