Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | Pass -EHs-c- to disable exceptions with MSVC. | Peter Collingbourne | 2018-01-25 | 1 | -1/+1 |
| | | * | | | gmock merging -2 | Gennadiy Civil | 2018-02-27 | 3 | -123/+328 |
| |_|/ / / |/| | | | | |||||
| | | * | | Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest in... | Xiaoyi Zhang | 2018-02-27 | 3 | -2/+16 |
| | | |\| | |||||
| | | | * | Merge branch 'master' into variant_matcher | Gennadiy Civil | 2018-02-27 | 3 | -2/+16 |
| | | | |\ | |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1464 from pwnall/death-style | Gennadiy Civil | 2018-02-27 | 3 | -2/+16 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Switch default death test style back to "fast". | Victor Costan | 2018-02-27 | 3 | -2/+16 |
|/ / / / | |||||
| | * / | Add documentation for VariantWith. | Xiaoyi Zhang | 2018-02-27 | 1 | -0/+2 |
| | |/ | |||||
| | * | Add matcher for std::variant. | Xiaoyi Zhang | 2018-02-27 | 2 | -0/+135 |
| |/ |/| | |||||
* | | Merge pull request #1472 from AndersSundmanTobii/master | Gennadiy Civil | 2018-02-26 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'master' into master | Gennadiy Civil | 2018-02-26 | 2 | -95/+86 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1475 from gennadiycivil/master | Gennadiy Civil | 2018-02-26 | 1 | -21/+19 |
|\ \ \ | |||||
| * | | | merging unittests - 5 | Gennadiy Civil | 2018-02-26 | 1 | -5/+5 |
| * | | | merging unitests - check 4 | Gennadiy Civil | 2018-02-23 | 1 | -14/+13 |
| * | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-02-23 | 0 | -0/+0 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1474 from gennadiycivil/master | Gennadiy Civil | 2018-02-23 | 1 | -11/+3 |
|\ \ \ \ | |||||
| | * | | | merging unitests, check | Gennadiy Civil | 2018-02-23 | 1 | -4/+3 |
| |/ / / | |||||
| * / / | merging unittests - 2 | Gennadiy Civil | 2018-02-23 | 1 | -11/+3 |
|/ / / | |||||
* | | | Merge pull request #1473 from gennadiycivil/master | Gennadiy Civil | 2018-02-23 | 1 | -62/+63 |
|\ \ \ | |||||
| * | | | merging unitests | Gennadiy Civil | 2018-02-23 | 1 | -62/+63 |
|/ / / | |||||
* | | | Merge pull request #1471 from aleksejkozin/patch-1 | Gennadiy Civil | 2018-02-23 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into patch-1 | Aleksey Kozin | 2018-02-23 | 1 | -0/+2 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | TEST() arguments are invalid in an example | Aleksey Kozin | 2018-02-23 | 1 | -1/+1 |
| | * | | Removed trailing comma in enum | Anders Sundman (asum) | 2018-02-23 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1466 from pwnall/fix-death-warn | Gennadiy Civil | 2018-02-22 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into fix-death-warn | Gennadiy Civil | 2018-02-22 | 1 | -0/+10 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1469 from gennadiycivil/master | Gennadiy Civil | 2018-02-22 | 1 | -0/+10 |
|\ \ \ | |||||
| * | | | merges | Gennadiy Civil | 2018-02-22 | 1 | -0/+10 |
| | * | | Fix unused function warning on Mac OS. | Victor Costan | 2018-02-19 | 1 | -0/+2 |
| |/ / |/| | | |||||
* | | | Merge pull request #1450 from pwnall/fix-printers | Gennadiy Civil | 2018-02-15 | 1 | -1/+3 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into fix-printers | Gennadiy Civil | 2018-02-15 | 12 | -54/+67 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1459 from gennadiycivil/master | Gennadiy Civil | 2018-02-13 | 3 | -26/+34 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-02-13 | 0 | -0/+0 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1458 from gennadiycivil/master | Gennadiy Civil | 2018-02-13 | 9 | -28/+33 |
|\ \ \ \ |