summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix-argcConor Burgess2018-02-1244-288/+1066
|\
| * 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-0912-29/+36
| |\
| | * Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-099-14/+14
| | |\
| | | * Fixed typosrefs/pull/1446/headTroy Holsapple2018-02-089-14/+14
| | * | mergesrefs/pull/1448/headGennadiy Civil2018-02-093-15/+22
| | |/
| * | Add ability to throw from ASSERTAlexey Sokolov2018-02-085-8/+171
| |/
| * Merges and also adding new bazel build moderefs/pull/1435/headGennadiy Civil2018-01-311-1/+2
| * Code mergesGennadiy Civil2018-01-302-22/+64
| * Ability to optionally depend on Abseil plus upstream of 183716547refs/pull/1434/headGennadiy Civil2018-01-302-0/+40
| * Merge pull request #1428 from lidaobing/patch-2Gennadiy Civil2018-01-261-1/+1
| |\
| | * Update Documentation.mdrefs/pull/1428/headLI Daobing2018-01-261-1/+1
| * | Fix test build issue with GCC7.2.refs/pull/1426/headStefano Soffia2018-01-251-0/+3
| |/
| * placating gcc and its overzeauls size comparison warningsrefs/pull/1421/headGennadiy Civil2018-01-241-1/+1
| * upstream cl 182543808Gennadiy Civil2018-01-246-4/+181
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-241-1/+1
| |\
| | * Merge branch 'master' into win-libcxxrefs/pull/1410/headGennadiy Civil2018-01-2315-84/+117
| | |\
| | * \ Merge branch 'master' into win-libcxxGennadiy Civil2018-01-188-78/+346
| | |\ \
| | * | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h under l...Peter Collingbourne2018-01-181-1/+1
| * | | | revert, lets get this compiledrefs/pull/1418/headGennadiy Civil2018-01-241-46/+3
| * | | | Many code merge/upstream changesGennadiy Civil2018-01-2316-35/+93
| | |_|/ | |/| |
| * | | Merging, upstream http://cl/182836545Gennadiy Civil2018-01-235-10/+8
| * | | more code mergeGennadiy Civil2018-01-221-3/+1
| * | | merges, cl/155419551 and otherGennadiy Civil2018-01-224-27/+62
| * | | more mergingrefs/pull/1415/headGennadiy Civil2018-01-222-6/+4
| * | | mergingGennadiy Civil2018-01-221-2/+2
| * | | code mergeGennadiy Civil2018-01-228-43/+44
| * | | Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy Civil2018-01-189-105/+375
| |\ \ \ | | | |/ | | |/|
| | * | Adding python tests to Bazel build file. refs/pull/1412/headGennadiy Civil2018-01-181-1/+243
| | * | Use fully qualified in examplesrefs/pull/1407/headFedor Trushkin2018-01-181-2/+2
| | * | Document ScopedTrace utilityFedor Trushkin2018-01-181-7/+9
| | * | Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-176-70/+94
| | |/
| | * 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-152-53/+12
| | * Test files for corresponding changesGennadiy Civil2018-01-151-0/+2
| | * Test files for corresponding changesGennadiy Civil2018-01-151-6/+9
| | * Test files for corresponding changesGennadiy Civil2018-01-151-5/+25
| | * Test files for corresponding changesGennadiy Civil2018-01-151-0/+13
| | * 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
| * | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-122-1/+4
| |/
* | Merge branch 'master' into fix-argcConor Burgess2018-01-1256-665/+336
|\ \ | |/
| * Upstream cl 103120214Gennadiy Civil2018-01-113-7/+33
| * More merge, cleanuprefs/pull/1398/headGennadiy Civil2018-01-101-1/+1
| * More merge, cleanupGennadiy Civil2018-01-102-8/+5
| * Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-105-59/+62