aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1483 from gennadiycivil/masterGennadiy Civil2018-02-273-123/+328
|\
| * Merge branch 'master' into masterGennadiy Civil2018-02-272-3/+6
| |\ | |/ |/|
* | Merge pull request #1423 from pcc/win-libcxx2Gennadiy Civil2018-02-272-3/+6
|\ \
| * \ Merge branch 'master' into win-libcxx2Gennadiy Civil2018-02-2752-354/+826
| |\ \
| * | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.Peter Collingbourne2018-01-251-2/+5
| * | | Pass -EHs-c- to disable exceptions with MSVC.Peter Collingbourne2018-01-251-1/+1
| | | * gmock merging -2Gennadiy Civil2018-02-273-123/+328
| |_|/ |/| |
* | | Merge pull request #1464 from pwnall/death-styleGennadiy Civil2018-02-273-2/+16
|\ \ \ | |_|/ |/| |
| * | Switch default death test style back to "fast".Victor Costan2018-02-273-2/+16
|/ /
* | Merge pull request #1472 from AndersSundmanTobii/masterGennadiy Civil2018-02-261-1/+1
|\ \
| * \ Merge branch 'master' into masterGennadiy Civil2018-02-262-95/+86
| |\ \ | |/ / |/| |
* | | Merge pull request #1475 from gennadiycivil/masterGennadiy Civil2018-02-261-21/+19
|\ \ \
| * | | merging unittests - 5Gennadiy Civil2018-02-261-5/+5
| * | | merging unitests - check 4Gennadiy Civil2018-02-231-14/+13
| * | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-230-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1474 from gennadiycivil/masterGennadiy Civil2018-02-231-11/+3
|\ \ \ \
| | * | | merging unitests, checkGennadiy Civil2018-02-231-4/+3
| |/ / /
| * / / merging unittests - 2Gennadiy Civil2018-02-231-11/+3
|/ / /
* | | Merge pull request #1473 from gennadiycivil/masterGennadiy Civil2018-02-231-62/+63
|\ \ \
| * | | merging unitestsGennadiy Civil2018-02-231-62/+63
|/ / /
* | | Merge pull request #1471 from aleksejkozin/patch-1Gennadiy Civil2018-02-231-1/+1
|\ \ \
| * \ \ Merge branch 'master' into patch-1Aleksey Kozin2018-02-231-0/+2
| |\ \ \ | |/ / / |/| | |
| * | | TEST() arguments are invalid in an exampleAleksey Kozin2018-02-231-1/+1
| | * | Removed trailing comma in enumAnders Sundman (asum)2018-02-231-1/+1
| |/ / |/| |
* | | Merge pull request #1466 from pwnall/fix-death-warnGennadiy Civil2018-02-221-0/+2
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into fix-death-warnGennadiy Civil2018-02-221-0/+10
| |\ \ | |/ / |/| |
* | | Merge pull request #1469 from gennadiycivil/masterGennadiy Civil2018-02-221-0/+10
|\ \ \
| * | | mergesGennadiy Civil2018-02-221-0/+10
| | * | Fix unused function warning on Mac OS.Victor Costan2018-02-191-0/+2
| |/ / |/| |
* | | Merge pull request #1450 from pwnall/fix-printersGennadiy Civil2018-02-151-1/+3
|\ \ \
| * \ \ Merge branch 'master' into fix-printersGennadiy Civil2018-02-1512-54/+67
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1459 from gennadiycivil/masterGennadiy Civil2018-02-133-26/+34
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-130-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1458 from gennadiycivil/masterGennadiy Civil2018-02-139-28/+33
|\ \ \ \
| | * | | cleanup, mergesGennadiy Civil2018-02-133-26/+34
| |/ / /
| * | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-130-0/+0
| |\ \ \ | |/ / / |/| | |
| * | | cleanup/mergesGennadiy Civil2018-02-139-28/+33
| | * | Merge branch 'master' into fix-printersGennadiy Civil2018-02-136-70/+88
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1457 from gennadiycivil/masterGennadiy Civil2018-02-131-12/+12
|\| | |
| * | | merging, cleaning upGennadiy Civil2018-02-131-12/+12
|/ / /
* | | Merge pull request #1456 from gennadiycivil/masterGennadiy Civil2018-02-131-2/+1
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-130-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1454 from gennadiycivil/masterGennadiy Civil2018-02-131-7/+53
|\ \ \ \
| | * | | mergesGennadiy Civil2018-02-131-2/+1
| |/ / /
| * | | cxxx11Gennadiy Civil2018-02-131-0/+3
| * | | clang warningsGennadiy Civil2018-02-131-1/+1
| * | | clang warningsGennadiy Civil2018-02-131-2/+2
| * | | https://travis-ci.org/google/googletest/jobs/340995238Gennadiy Civil2018-02-131-5/+5
| * | | clang warning 'https://travis-ci.org/google/googletest/jobs/340987201'Gennadiy Civil2018-02-131-4/+4
| * | | clang warning https://travis-ci.org/google/googletest/jobs/340978022Gennadiy Civil2018-02-131-1/+1