aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into patch-1Aleksey Kozin2018-02-231-0/+2
|\
| * 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
| | |\ | | |/ | |/|
| | * Fix unused function warning on Mac OS.Victor Costan2018-02-191-0/+2
* | | TEST() arguments are invalid in an exampleAleksey Kozin2018-02-231-1/+1
|/ /
* | Merge pull request #1469 from gennadiycivil/masterGennadiy Civil2018-02-221-0/+10
|\ \ | |/ |/|
| * mergesGennadiy Civil2018-02-221-0/+10
* | 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
| * | mergesGennadiy Civil2018-02-131-3/+46
|/ /
* | Merge pull request #1452 from gennadiycivil/masterGennadiy Civil2018-02-124-49/+22
|\ \
| * \ Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-120-0/+0
| |\ \ | |/ / |/| |
| * | moving JoinAsTuple to internalGennadiy Civil2018-02-124-49/+22
| | * Fix std::iscntrl use in gtest-printers.ccVictor Costan2018-02-121-1/+3
| |/ |/|
* | Merge pull request #1451 from gennadiycivil/masterGennadiy Civil2018-02-122-7/+9
|\|
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-120-0/+0
| |\ | |/ |/|
* | Merge pull request #1449 from gennadiycivil/masterGennadiy Civil2018-02-101-11/+38
|\ \
| | * Merging, coniniueGennadiy Civil2018-02-122-7/+9
| |/
| * mergingGennadiy Civil2018-02-091-2/+0
| * mergesGennadiy Civil2018-02-091-11/+40
|/
* Merge pull request #1439 from DarthGandalf/assertGennadiy Civil2018-02-095-8/+171
|\
| * Merge branch 'master' into assertGennadiy Civil2018-02-0920-50/+61
| |\ | |/ |/|
* | Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-0914-27/+27
|\ \
| * | Fixed typosTroy Holsapple2018-02-0714-27/+27
* | | Merge pull request #1448 from gennadiycivil/masterGennadiy Civil2018-02-095-23/+33
|\ \ \ | |/ / |/| |
| * | mergesGennadiy Civil2018-02-095-23/+33
|/ /
* | Include MSVC14 on PRs as wellGennadiy Civil2018-02-061-0/+1
| * Add ability to throw from ASSERTAlexey Sokolov2018-02-085-8/+171
|/
* Merge pull request #1435 from gennadiycivil/masterGennadiy Civil2018-01-314-22/+67
|\
| * Merges and also adding new bazel build modeGennadiy Civil2018-01-313-1/+4
| * Code mergesGennadiy Civil2018-01-302-22/+64