aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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 branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2018-01-032-2/+10
| | | |\ | |_|_|/ |/| | |
* | | | 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
|/ / /
| | * 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 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 branch 'master' into masterbryanzim2017-12-159-360/+193
| |\ \ \
| * \ \ \ Merge branch 'master' into masterbryanzim2017-12-118-29/+309
| |\ \ \ \
| * | | | | remove extra lineBryan Zimmerman2017-12-111-1/+0
| * | | | | remove implicit castsBryan Zimmerman2017-12-114-10/+8
| * | | | | Merge branch 'master' into masterbryanzim2017-12-112-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into masterbryanzim2017-12-081-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into masterbryanzim2017-12-084-5/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into masterbryanzim2017-12-062-4/+7
| |\ \ \ \ \ \ \ \
| * | | | | | | | | replaced back accidently removed static_cast with consistent ImplicitCast_Bryan Zimmerman2017-11-221-1/+1
| * | | | | | | | | Merge branch 'master' into masterbryanzim2017-10-302-4/+12
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix for VS2017 deprecation of ::tr1::tupleBryan Zimmerman2017-10-276-22/+31
| | | | | | | | | | * Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-1917-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
| * | | | | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-1817-389/+502
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-096-6/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-011-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-11-0714-47/+136
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-0420-22/+22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-2410-163/+193
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-086-11/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-0416-112/+4
* | | | | | | | | | | | | | | | Merge pull request #1212 from qzmfranklin/bazelGennadiy Civil2017-12-191-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into bazelGennadiy Civil2017-12-18108-1981/+3326
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into bazelGennadiy Civil2017-08-224-9/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into bazelZhongming Qu2017-08-181-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Also can build when included in source.Zhongming Qu2017-08-181-1/+1
| * | | | | | | | | | | | | | | | | Remove trailing whitespaces in BUILD.bazelZhongming Qu2017-08-181-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 08:41:32 +0000