summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow macros inside of parametrized test names.Bernhard Bauer2018-03-124-8/+35
* 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
| |\
| | * Merge branch 'master' into win-libcxxrefs/pull/1410/headGennadiy Civil2018-01-2315-84/+117
| | |\ | | |/ | |/|
| * | Merge pull request #1417 from gennadiycivil/masterGennadiy Civil2018-01-238-40/+71
| |\ \
| | | * 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
| |/ / / |/| | |
* | | | Merge branch 'master' of https://github.com/google/googletestrefs/pull/1417/headGennadiy Civil2018-01-230-0/+0
|\ \ \ \ | |/ / /
| * | | Merge pull request #1415 from gennadiycivil/masterGennadiy Civil2018-01-227-43/+42
| |\ \ \
* | | | | 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 pull request #1401 from eidosmontreal/support_xboxoneGennadiy Civil2018-01-192-1/+4
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy Civil2018-01-1810-128/+415
| |\ \ | |/ / |/| |
* | | Merge pull request #1412 from gennadiycivil/masterGennadiy Civil2018-01-181-1/+243
|\ \ \
| * | | Adding python tests to Bazel build file. refs/pull/1412/headGennadiy Civil2018-01-181-1/+243
|/ / /
* | | Merge pull request #1407 from ted-xp/masterGennadiy Civil2018-01-187-77/+103
|\ \ \ | |_|/ |/| |
| * | 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
|/ /
* | Merge pull request #1402 from gennadiycivil/masterGennadiy Civil2018-01-152-23/+25
|\ \
| * | 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
| * | Merge branch 'master' of github.com:gennadiycivil/googletestGennadiy Civil2018-01-150-0/+0
| |\ \
| | * \ Merge branch 'master' into masterGennadiy Civil2018-01-151-23/+40
| | |\ \ | |_|/ / |/| | |
| * | | More code mergesGennadiy Civil2018-01-151-18/+15
| * | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-151-23/+40
| |\ \ \ | |/ / / |/| / / | |/ /
* | | Merge pull request #1339 from Romain-Geissler/fix-core-dump-sharedGennadiy Civil2018-01-151-23/+40
|\ \ \
| * \ \ Merge branch 'master' into fix-core-dump-sharedrefs/pull/1339/headGennadiy Civil2018-01-1322-154/+180
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1400 from gennadiycivil/masterGennadiy Civil2018-01-131-4/+4
|\ \ \ \
| | * \ \ Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2018-01-0970-772/+860
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2017-12-085-2/+12
| | |\ \ \ \
| | * | | | | Fix double free when building Gtest/GMock in shared libraries and linking a t...Romain Geissler2017-12-021-23/+40
| | | | | * | Code mergingGennadiy Civil2018-01-152-8/+16
| | |_|_|/ / | |/| | | |
| * | | | | continue upstream/merge, etcrefs/pull/1400/headGennadiy Civil2018-01-111-4/+4
| * | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-111-2/+2
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Trying to fix travisGennadiy Civil2018-01-111-4/+0
| | | | | * Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest...Gaspard Petit2018-01-120-0/+0
| | | | | |\
| | | | | | * Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest...Gaspard Petit2018-01-120-0/+0
| | | | | | |\
generated by cgit v0.12 at 2025-03-03 11:00:26 (GMT)