aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2018-01-0970-772/+860
|\
| * Merge pull request #1388 from rongjiecomputer/bazelGennadiy Civil2018-01-083-7/+18
| |\
| | * [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcLoo Rong Jie2018-01-093-7/+18
| |/
| * Merge pull request #1390 from gennadiycivil/masterGennadiy Civil2018-01-082-2/+5
| |\
| | * Small cleanups, mergeGennadiy Civil2018-01-082-2/+5
| |/
| * Merge pull request #1387 from coryan/optimize-build-matrix-readyGennadiy Civil2018-01-082-1/+21
| |\
| | * Use correct name for build event types.Carlos O'Ryan2018-01-051-4/+4
| | * Fixed test for pull request.Carlos O'Ryan2018-01-051-2/+2
| | * Fixed output and test for 'enabled_on_pr'Carlos O'Ryan2018-01-051-6/+4
| | * Optimize build matrix (#1)Carlos O'Ryan2018-01-042-1/+23
| * | Merge pull request #1385 from gennadiycivil/masterGennadiy Civil2018-01-0611-16/+9
| |\ \
| | * \ Merge branch 'master' into masterGennadiy Civil2018-01-059-48/+56
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1007 from davidben/missing-declarationsGennadiy Civil2018-01-058-47/+55
| |\ \ \
| | * \ \ Merge branch 'master' into missing-declarationsGennadiy Civil2018-01-0428-170/+215
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1377 from davidben/clang-clGennadiy 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-038-47/+55
| | |/ / /
| | | * | Revert one file for nowGennadiy Civil2018-01-051-10/+0
| | | * | code cleanup in preparation for merges, cl 180857299Gennadiy Civil2018-01-0412-16/+19
| | |/ / | |/| |
| * | | Merge pull request #1378 from gennadiycivil/masterGennadiy Civil2018-01-0418-136/+11
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'master' into masterGennadiy Civil2018-01-049-33/+203
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1341 from coryan/fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2018-01-039-33/+203
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2018-01-032-8/+3
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2018-01-032-2/+10
| | |\ \
| | * | | Build both googletest and googlemock.Carlos O'Ryan2017-12-241-2/+0
| | * | | Create a autotools-based build for Travis.Carlos O'Ryan2017-12-244-2/+99
| | * | | Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-223-15/+13
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-1917-115/+7
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-1520-393/+508
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-085-2/+12
| | |\ \ \ \ \ \
| | * | | | | | | Run autoconf from top-level directory.Carlos O'Ryan2017-12-035-31/+106
| | | | | | | | * upstreaming cl 124976692Gennadiy Civil2018-01-0318-136/+11
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #1374 from davidben/tuple-msvcGennadiy Civil2018-01-031-1/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into tuple-msvcGennadiy Civil2018-01-031-2/+6
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Fix testing::Combine on MSVC 2017.David Benjamin2018-01-021-1/+1
| * | | | | | | | Merge pull request #991 from davidben/uintptrGennadiy Civil2018-01-031-7/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'master' into uintptrGennadiy Civil2018-01-02177-28909/+4138
| | |\| | | | | |
| | * | | | | | | Pass MSVC's C4826 warning.David Benjamin2017-08-071-7/+2
| * | | | | | | | Merge pull request #1376 from gennadiycivil/masterSamuel Benzaquen2018-01-031-2/+6
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | OSS Sync, cl 163329677misterg2018-01-021-2/+6
| |/ / / / / / /
| * | | | | | | Merge pull request #1109 from davidben/vs2017Gennadiy Civil2018-01-021-0/+4
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Avoid warning C4619 in MSVC 2017.David Benjamin2017-12-251-0/+4
| |/ / / / / /
| * | | | | | Merge pull request #778 from gpakosz/C4389Gennadiy Civil2017-12-211-2/+0
| |\ \ \ \ \ \
| | * | | | | | Re-enable MSVC++ C4389 warning in CmdHelperEq()Gregory Pakosz2017-12-211-2/+0
| |/ / / / / /
| * | | | | | Merge pull request #1357 from bryanzim/masterGennadiy Civil2017-12-202-13/+13
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Update internal_utils.cmakebryanzim2017-12-201-2/+1
| | * | | | | Merge branch 'master' into masterbryanzim2017-12-2017-115/+7
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #1248 from aninf-wo/hethi/issue-360-remove-GTEST_HAS_PARAM...Gennadiy Civil2017-12-1916-112/+4
| |\ \ \ \ \ \
| | * | | | | | Update gtest-param-test.h.pumpGennadiy Civil2017-12-191-3/+0
| | * | | | | | Update gtest-param-test.h.pumpGennadiy Civil2017-12-191-0/+3