aboutsummaryrefslogtreecommitdiffstats
path: root/googletest/include
Commit message (Expand)AuthorAgeFilesLines
...
* | | cleanup, mergesGennadiy Civil2018-02-133-26/+34
* | | cleanup/mergesGennadiy Civil2018-02-132-5/+8
* | | mergingGennadiy Civil2018-02-091-2/+0
* | | mergesGennadiy Civil2018-02-091-11/+40
* | | Merge branch 'master' into assertGennadiy Civil2018-02-092-14/+15
|\ \ \
| * \ \ Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-091-1/+1
| |\ \ \
| | * | | Fixed typosTroy Holsapple2018-02-071-1/+1
| * | | | mergesGennadiy Civil2018-02-091-13/+14
| |/ / /
* / / / Add ability to throw from ASSERTAlexey Sokolov2018-02-081-1/+15
|/ / /
* | | Merges and also adding new bazel build modeGennadiy Civil2018-01-311-1/+2
* | | Code mergesGennadiy Civil2018-01-301-15/+57
* | | Ability to optionally depend on Abseil plus upstream of 183716547Gennadiy Civil2018-01-301-0/+28
|/ /
* / upstream cl 182543808Gennadiy Civil2018-01-241-0/+3
|/
* Merge branch 'master' into win-libcxxGennadiy Civil2018-01-232-4/+10
|\
| * merges, cl/155419551 and otherGennadiy Civil2018-01-221-4/+7
| * Merge branch 'master' into support_xboxoneGennadiy 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-171-1/+1
|/ /
* | Reverting some changes, need to make the merge compileGennadiy 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, etcGennadiy Civil2018-01-111-4/+4
|/
* Upstream cl 103120214Gennadiy Civil2018-01-112-4/+31
* More merge, cleanupGennadiy Civil2018-01-101-1/+1
* More merge, cleanupGennadiy Civil2018-01-101-2/+1
* Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-105-59/+62
* revertGennadiy Civil2018-01-101-68/+9
* code merges, cleanupGennadiy Civil2018-01-102-11/+70
* code merge, cleanupsGennadiy Civil2018-01-091-1/+1
* Upstream of cl 129104714Gennadiy 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
* Merge branch 'master' into missing-declarationsGennadiy Civil2018-01-041-1/+1
|\
| * Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.David Benjamin2018-01-031-1/+1
* | Pass the -Wmissing-declarations warning.David Benjamin2018-01-032-9/+9
|/
* Merge pull request #1374 from davidben/tuple-msvcGennadiy Civil2018-01-031-1/+1
|\
| * Fix testing::Combine on MSVC 2017.David Benjamin2018-01-021-1/+1
* | Merge branch 'master' into uintptrGennadiy Civil2018-01-0210-76/+76
|\|
| * Avoid warning C4619 in MSVC 2017.David Benjamin2017-12-251-0/+4
| * Re-enable MSVC++ C4389 warning in CmdHelperEq()Gregory Pakosz2017-12-211-2/+0
| * Update gtest-param-test.h.pumpGennadiy Civil2017-12-191-3/+0
| * Update gtest-param-test.h.pumpGennadiy Civil2017-12-191-0/+3
| * Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-091-0/+3
| |\
| | * Remove C4996 warning in VS2017Wojciech Mamrak2017-12-071-0/+3