summaryrefslogtreecommitdiffstats
path: root/googletest/include
Commit message (Expand)AuthorAgeFilesLines
...
* mergeGennadiy Civil2018-04-101-4/+3
|\
| * Revert "gmock actions 2"refs/pull/1556/headGennadiy Civil2018-04-101-13/+0
| * this should be itGennadiy Civil2018-04-091-4/+0
| * yet moreGennadiy Civil2018-04-091-3/+3
| * formattingGennadiy Civil2018-04-091-1/+3
| * moreGennadiy Civil2018-04-091-6/+9
* | RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors...Gennadiy Civil2018-04-101-3/+4
|/
* more warningsGennadiy Civil2018-04-061-0/+1
* more MSVC warningsGennadiy Civil2018-04-061-0/+11
* fix build break on locale windowsfo402252018-04-041-1/+1
* merging port, cont. 191443078refs/pull/1539/headGennadiy Civil2018-04-031-3/+5
* merging, cont - 2Gennadiy Civil2018-04-031-16/+0
* merging gtest-port.h , 191439094Gennadiy Civil2018-04-031-4/+7
* merging, just comments formatrefs/pull/1537/headGennadiy Civil2018-04-031-1/+3
* testing, mergeGennadiy Civil2018-04-031-1/+1
* Testing, gtest-port.h mergeGennadiy Civil2018-04-031-0/+3
* merging gtest-port.h, again - 1refs/pull/1534/headGennadiy Civil2018-04-021-5/+9
* Revert "merging gtest-port 1 of N"refs/pull/1527/headGennadiy Civil2018-03-291-14/+9
* Revert "merging gtest-port, 2"refs/pull/1526/headGennadiy Civil2018-03-291-9/+37
* merging gtest-port, 2refs/pull/1525/headGennadiy Civil2018-03-291-37/+9
* merging gtest-port 1 of Nrefs/pull/1518/headGennadiy Civil2018-03-271-9/+14
* merges, gtestGennadiy Civil2018-03-261-0/+4
* more mergesGennadiy Civil2018-03-221-1/+1
* More mergesGennadiy Civil2018-03-211-1/+2
* cl 189032107, againrefs/pull/1508/headGennadiy Civil2018-03-161-4/+19
* cl 189032107Gennadiy Civil2018-03-161-17/+9
* merge, again, IsRecursiveContainerrefs/pull/1507/headGennadiy Civil2018-03-152-18/+69
* merging, mergingGennadiy Civil2018-03-131-0/+2
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-133-8/+7
|\
| * Merge branch 'master' into upstream_188748737refs/pull/1503/headBernhard Bauer2018-03-126-98/+254
| |\
| * | Allow macros inside of parametrized test names.Bernhard Bauer2018-03-123-8/+7
* | | More merges, removing old dead codeGennadiy Civil2018-03-131-8/+6
| |/ |/|
* | merges-port(1)refs/pull/1502/headGennadiy Civil2018-03-121-14/+22
* | merges-8refs/pull/1493/headGennadiy Civil2018-03-051-5/+9
* | Merges-1Gennadiy Civil2018-03-051-8/+12
* | Merge pull request #1423 from pcc/win-libcxx2Gennadiy Civil2018-02-271-2/+5
|\ \
| * \ Merge branch 'master' into win-libcxx2refs/pull/1423/headGennadiy Civil2018-02-275-69/+193
| |\ \
| * | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.Peter Collingbourne2018-01-251-2/+5
* | | | Switch default death test style back to "fast".refs/pull/1464/headVictor Costan2018-02-271-0/+10
| |/ / |/| |
* | | Removed trailing comma in enumAnders Sundman (asum)2018-02-231-1/+1
* | | cleanup, mergesGennadiy Civil2018-02-133-26/+34
* | | cleanup/mergesGennadiy Civil2018-02-132-5/+8
* | | mergingrefs/pull/1449/headGennadiy Civil2018-02-091-2/+0
* | | mergesGennadiy Civil2018-02-091-11/+40
* | | Merge branch 'master' into assertrefs/pull/1439/headGennadiy Civil2018-02-092-14/+15
|\ \ \
| * \ \ Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-091-1/+1
| |\ \ \
| | * | | Fixed typosrefs/pull/1446/headTroy Holsapple2018-02-081-1/+1
| * | | | mergesrefs/pull/1448/headGennadiy Civil2018-02-091-13/+14
| |/ / /
* | | | Add ability to throw from ASSERTAlexey Sokolov2018-02-081-1/+15
|/ / /
* | | Merges and also adding new bazel build moderefs/pull/1435/headGennadiy Civil2018-01-311-1/+2