Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ | | | | | | | cleanup, merges | ||||
| | * | 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 |
| |\ \ | | | | | | | | | cleanup, merges | ||||
| | | * | cleanup, merges | 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 |
| | |\ | | |/ | |/| | |||||
| | * | cleanup/merges | Gennadiy Civil | 2018-02-13 | 9 | -28/+33 |
| | | | |||||
* | | | Merge branch 'master' into fix-printers | Gennadiy Civil | 2018-02-13 | 6 | -70/+88 |
|\| | | |||||
| * | | Merge pull request #1457 from gennadiycivil/master | Gennadiy Civil | 2018-02-13 | 1 | -12/+12 |
| |\| | | | | | | | merging, cleaning up | ||||
| | * | merging, cleaning up | Gennadiy Civil | 2018-02-13 | 1 | -12/+12 |
| |/ | |||||
| * | Merge pull request #1456 from gennadiycivil/master | Gennadiy Civil | 2018-02-13 | 1 | -2/+1 |
| |\ | | | | | | | merges | ||||
| | * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-02-13 | 0 | -0/+0 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #1454 from gennadiycivil/master | Gennadiy Civil | 2018-02-13 | 1 | -7/+53 |
| |\ \ | | | | | | | | | merges | ||||
| | | * | merges | Gennadiy Civil | 2018-02-13 | 1 | -2/+1 |
| | |/ | |||||
| | * | cxxx11 | Gennadiy Civil | 2018-02-13 | 1 | -0/+3 |
| | | | |||||
| | * | clang warnings | Gennadiy Civil | 2018-02-13 | 1 | -1/+1 |
| | | | |||||
| | * | clang warnings | Gennadiy Civil | 2018-02-13 | 1 | -2/+2 |
| | | | |||||
| | * | https://travis-ci.org/google/googletest/jobs/340995238 | Gennadiy Civil | 2018-02-13 | 1 | -5/+5 |
| | | | |||||
| | * | clang warning 'https://travis-ci.org/google/googletest/jobs/340987201' | Gennadiy Civil | 2018-02-13 | 1 | -4/+4 |
| | | | |||||
| | * | clang warning https://travis-ci.org/google/googletest/jobs/340978022 | Gennadiy Civil | 2018-02-13 | 1 | -1/+1 |
| | | | |||||
| | * | merges | Gennadiy Civil | 2018-02-13 | 1 | -3/+46 |
| |/ | |||||
| * | Merge pull request #1452 from gennadiycivil/master | Gennadiy Civil | 2018-02-12 | 4 | -49/+22 |
| |\ | | | | | | | moving JoinAsTuple to internal | ||||
| | * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-02-12 | 0 | -0/+0 |
| | |\ | | |/ | |/| | |||||
| | * | moving JoinAsTuple to internal | Gennadiy Civil | 2018-02-12 | 4 | -49/+22 |
| | | | |||||
* | | | Fix std::iscntrl use in gtest-printers.cc | Victor Costan | 2018-02-12 | 1 | -1/+3 |
|/ / | | | | | | | | | | | | | | | ContainsUnprintableControlCodes() in gtest-printers.cc passes a char argument to std::iscntrl. Although its argument is an int, std::iscntrl produces undefined behavior if its argument is not representable as an unsigned char. The standard library on Windows asserts that the argument is an unsigned char, resulting in an assertion crash on debug builds. | ||||
* | | Merge pull request #1451 from gennadiycivil/master | Gennadiy Civil | 2018-02-12 | 2 | -7/+9 |
|\| | | | | | merges | ||||
| * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-02-12 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1449 from gennadiycivil/master | Gennadiy Civil | 2018-02-10 | 1 | -11/+38 |
|\ \ | | | | | | | merges | ||||
| | * | Merging, coniniue | Gennadiy Civil | 2018-02-12 | 2 | -7/+9 |
| |/ | |||||
| * | merging | Gennadiy Civil | 2018-02-09 | 1 | -2/+0 |
| | | |||||
| * | merges | Gennadiy Civil | 2018-02-09 | 1 | -11/+40 |
|/ | |||||
* | Merge pull request #1439 from DarthGandalf/assert | Gennadiy Civil | 2018-02-09 | 5 | -8/+171 |
|\ | | | | | Add ability to throw from ASSERT | ||||
| * | Merge branch 'master' into assert | Gennadiy Civil | 2018-02-09 | 20 | -50/+61 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1446 from tholsapp/master | Gennadiy Civil | 2018-02-09 | 14 | -27/+27 |
|\ \ | | | | | | | Fixed typos | ||||
| * | | Fixed typos | Troy Holsapple | 2018-02-07 | 14 | -27/+27 |
| | | | |||||
* | | | Merge pull request #1448 from gennadiycivil/master | Gennadiy Civil | 2018-02-09 | 5 | -23/+33 |
|\ \ \ | |/ / |/| | | merges | ||||
| * | | merges | Gennadiy Civil | 2018-02-09 | 5 | -23/+33 |
|/ / | |||||
* | | Include MSVC14 on PRs as well | Gennadiy Civil | 2018-02-06 | 1 | -0/+1 |
| | | |||||
| * | Add ability to throw from ASSERT | Alexey Sokolov | 2018-02-08 | 5 | -8/+171 |
|/ | | | | | | | while not losing benefits of EXPECT, and not killing the whole test, as with --gtest_throw_on_failure. 183822976 | ||||
* | Merge pull request #1435 from gennadiycivil/master | Gennadiy Civil | 2018-01-31 | 4 | -22/+67 |
|\ | | | | | Code merges | ||||
| * | Merges and also adding new bazel build mode | Gennadiy Civil | 2018-01-31 | 3 | -1/+4 |
| | | |||||
| * | Code merges | Gennadiy Civil | 2018-01-30 | 2 | -22/+64 |
| | | |||||
* | | Merge pull request #1434 from gennadiycivil/master | Gennadiy Civil | 2018-01-30 | 4 | -0/+67 |
|\| | | | | | Ability to optionally depend on Abseil plus upstream of 183716547 | ||||
| * | Ability to optionally depend on Abseil plus upstream of 183716547 | Gennadiy Civil | 2018-01-30 | 4 | -0/+67 |
| | | |||||
* | | Merge pull request #1430 from gennadiycivil/master | Gennadiy Civil | 2018-01-29 | 2 | -6/+72 |
|\| | | | | | Adding tests to googlemock bazel | ||||
| * | Adding tests to googlemock bazel | Gennadiy Civil | 2018-01-26 | 2 | -6/+72 |
| | | |||||
* | | Merge pull request #1429 from gennadiycivil/master | Gennadiy Civil | 2018-01-26 | 9 | -34/+86 |
|\| | | | | | Code merges | ||||
| * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-26 | 2 | -1/+4 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1428 from lidaobing/patch-2 | Gennadiy Civil | 2018-01-26 | 1 | -1/+1 |
|\ \ | | | | | | | Update Documentation.md | ||||
| * | | Update Documentation.md | LI Daobing | 2018-01-26 | 1 | -1/+1 |
| | | |