aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1452 from gennadiycivil/masterGennadiy Civil2018-02-124-49/+22
|\ | | | | moving JoinAsTuple to internal
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-02-120-0/+0
| |\ | |/ |/|
* | Merge pull request #1451 from gennadiycivil/masterGennadiy Civil2018-02-122-7/+9
|\ \ | | | | | | merges
| | * moving JoinAsTuple to internalGennadiy Civil2018-02-124-49/+22
| |/
| * 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
|\ \ | | | | | | merges
| | * 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
|\ | | | | Add ability to throw from ASSERT
| * Merge branch 'master' into assertGennadiy Civil2018-02-0920-50/+61
| |\ | |/ |/|
* | Merge pull request #1446 from tholsapp/masterGennadiy Civil2018-02-0914-27/+27
|\ \ | | | | | | Fixed typos
| * | Fixed typosTroy Holsapple2018-02-0714-27/+27
| | |
* | | Merge pull request #1448 from gennadiycivil/masterGennadiy Civil2018-02-095-23/+33
|\ \ \ | |/ / |/| | merges
| * | 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
|/ | | | | | | while not losing benefits of EXPECT, and not killing the whole test, as with --gtest_throw_on_failure. 183822976
* Merge pull request #1435 from gennadiycivil/masterGennadiy Civil2018-01-314-22/+67
|\ | | | | Code merges
| * Merges and also adding new bazel build modeGennadiy Civil2018-01-313-1/+4
| |
| * Code mergesGennadiy Civil2018-01-302-22/+64
| |
* | Merge pull request #1434 from gennadiycivil/masterGennadiy Civil2018-01-304-0/+67
|\| | | | | Ability to optionally depend on Abseil plus upstream of 183716547
| * Ability to optionally depend on Abseil plus upstream of 183716547Gennadiy Civil2018-01-304-0/+67
| |
* | Merge pull request #1430 from gennadiycivil/masterGennadiy Civil2018-01-292-6/+72
|\| | | | | Adding tests to googlemock bazel
| * Adding tests to googlemock bazelGennadiy Civil2018-01-262-6/+72
| |
* | Merge pull request #1429 from gennadiycivil/masterGennadiy Civil2018-01-269-34/+86
|\| | | | | Code merges
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-262-1/+4
| |\ | |/ |/|
* | Merge pull request #1428 from lidaobing/patch-2Gennadiy Civil2018-01-261-1/+1
|\ \ | | | | | | Update Documentation.md
| * | Update Documentation.mdLI Daobing2018-01-261-1/+1
| | |
* | | Merge pull request #1426 from stefanosoffia/fix_test_build_gcc7_2_0Gennadiy Civil2018-01-261-0/+3
|\ \ \ | |/ / |/| | Fix test build issue with GCC7.2 (with -Wno-error=)
| * | Fix test build issue with GCC7.2.Stefano Soffia2018-01-251-0/+3
|/ /
| * Code mergesGennadiy Civil2018-01-269-34/+86
|/
* Update README.mdGennadiy Civil2018-01-251-1/+1
|
* Remove Visual Studio 10,11,12 from build matrixGennadiy Civil2018-01-251-15/+0
|
* Merge pull request #1421 from gennadiycivil/masterGennadiy Civil2018-01-246-4/+181
|\ | | | | upstream cl 182543808
| * placating gcc and its overzeauls size comparison warningsGennadiy Civil2018-01-241-1/+1
| |
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-240-0/+0
| |\ | |/ |/|
* | Merge pull request #1418 from gennadiycivil/masterGennadiy Civil2018-01-2415-32/+47
|\ \ | | | | | | Many code merge/upstream changes
| | * upstream cl 182543808Gennadiy Civil2018-01-246-4/+181
| | |
| | * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-241-1/+1
| |/| | |/ |/|
* | Merge pull request #1410 from pcc/win-libcxxGennadiy Civil2018-01-241-1/+1
|\ \ | | | | | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h…
| * \ Merge branch 'master' into win-libcxxGennadiy Civil2018-01-2315-84/+117
| |\ \ | |/ / |/| |
* | | Merge pull request #1417 from gennadiycivil/masterGennadiy Civil2018-01-238-40/+71
|\ \ \ | | | | | | | | merges, cl/155419551 and others
| | * \ Merge branch 'master' into win-libcxxGennadiy Civil2018-01-188-78/+346
| | |\ \
| | * | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h under ↵Peter Collingbourne2018-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libc++. If _MSC_VER is defined, it means that we are using the Microsoft ABI, so cxxabi.h (which is associated with the Itanium ABI) will not be available.
| | | | * revert, lets get this compiledGennadiy Civil2018-01-241-46/+3
| | | | |
| | | | * Many code merge/upstream changesGennadiy Civil2018-01-2316-35/+93
| | |_|/ | |/| |
| * | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-230-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1415 from gennadiycivil/masterGennadiy Civil2018-01-227-43/+42
|\ \ \ \ | | | | | | | | | | code merge
| | * | | Merging, upstream http://cl/182836545Gennadiy Civil2018-01-235-10/+8
| | | | |
| | * | | more code mergeGennadiy Civil2018-01-221-3/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-11 08:18:52 +0000