summaryrefslogtreecommitdiffstats
path: root/googletest/include
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Code mergesGennadiy Civil2018-01-301-15/+57
* | | Ability to optionally depend on Abseil plus upstream of 183716547refs/pull/1434/headGennadiy Civil2018-01-301-0/+28
|/ /
* | upstream cl 182543808Gennadiy Civil2018-01-241-0/+3
|/
* Merge branch 'master' into win-libcxxrefs/pull/1410/headGennadiy Civil2018-01-232-4/+10
|\
| * merges, cl/155419551 and otherGennadiy Civil2018-01-221-4/+7
| * Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy Civil2018-01-183-72/+82
| |\
| * | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-121-0/+3
* | | Merge branch 'master' into win-libcxxGennadiy Civil2018-01-182-45/+53
|\ \ \ | | |/ | |/|
| * | Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-172-45/+53
* | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h under l...Peter Collingbourne2018-01-181-1/+1
|/ /
* | Reverting some changes, need to make the merge compilerefs/pull/1402/headGennadiy Civil2018-01-151-1/+1
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-2/+3
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-1/+0
* | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-4/+1
* | More code mergesGennadiy Civil2018-01-151-18/+15
* | Code mergingGennadiy Civil2018-01-152-8/+16
* | continue upstream/merge, etcrefs/pull/1400/headGennadiy Civil2018-01-111-4/+4
|/
* Upstream cl 103120214Gennadiy Civil2018-01-112-4/+31
* More merge, cleanuprefs/pull/1398/headGennadiy Civil2018-01-101-1/+1
* More merge, cleanupGennadiy Civil2018-01-101-2/+1
* Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-105-59/+62
* revertrefs/pull/1396/headGennadiy Civil2018-01-101-68/+9
* code merges, cleanupGennadiy Civil2018-01-102-11/+70
* code merge, cleanupsGennadiy Civil2018-01-101-1/+1
* Upstream of cl 129104714refs/pull/1394/headGennadiy Civil2018-01-092-49/+50
* Revert one fileGennadiy Civil2018-01-091-2/+3
* wip, cleanups/mergeGennadiy Civil2018-01-092-5/+3
* cleanup, mergeGennadiy Civil2018-01-093-2/+4
generated by cgit v0.12 at 2024-11-19 12:35:37 (GMT)