Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | code merges, cleanup | Gennadiy Civil | 2018-01-10 | 3 | -12/+71 |
* | revert googletest/test/gtest-param-test_test.ccrefs/pull/1395/head | Gennadiy Civil | 2018-01-10 | 1 | -46/+3 |
* | code merge, cleanups | Gennadiy Civil | 2018-01-10 | 5 | -20/+59 |
* | Upstream of cl 129104714refs/pull/1394/head | Gennadiy Civil | 2018-01-09 | 2 | -49/+50 |
* | Revert one file | Gennadiy Civil | 2018-01-09 | 1 | -2/+3 |
* | wip, cleanups/merge | Gennadiy Civil | 2018-01-09 | 3 | -5/+3 |
* | Merge branch 'master' into masterrefs/pull/1393/head | Gennadiy Civil | 2018-01-09 | 1 | -3/+6 |
|\ | |||||
| * | [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcrefs/pull/1388/head | Loo Rong Jie | 2018-01-09 | 1 | -3/+6 |
* | | cleanup, merge | Gennadiy Civil | 2018-01-09 | 3 | -2/+4 |
|/ | |||||
* | Small cleanups, mergerefs/pull/1390/head | Gennadiy Civil | 2018-01-08 | 2 | -2/+5 |
* | Merge branch 'master' into masterrefs/pull/1385/head | Gennadiy Civil | 2018-01-05 | 6 | -43/+51 |
|\ | |||||
| * | Merge branch 'master' into missing-declarationsrefs/pull/1007/head | Gennadiy Civil | 2018-01-05 | 19 | -159/+71 |
| |\ | |||||
| | * | Merge pull request #1377 from davidben/clang-cl | Gennadiy Civil | 2018-01-05 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.refs/pull/1377/head | David Benjamin | 2018-01-03 | 1 | -1/+1 |
| * | | | Pass the -Wmissing-declarations warning. | David Benjamin | 2018-01-03 | 5 | -42/+50 |
| | |/ | |/| | |||||
* | | | Revert one file for now | Gennadiy Civil | 2018-01-05 | 1 | -10/+0 |
* | | | code cleanup in preparation for merges, cl 180857299 | Gennadiy Civil | 2018-01-05 | 12 | -16/+19 |
| |/ |/| | |||||
* | | Merge branch 'master' into masterrefs/pull/1378/head | Gennadiy Civil | 2018-01-04 | 1 | -30/+59 |
|\ \ | |||||
| * \ | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodulerefs/pull/1341/head | Gennadiy Civil | 2018-01-03 | 2 | -8/+3 |
| |\ \ | | |/ | |||||
| * | | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2018-01-03 | 2 | -2/+10 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2017-12-22 | 2 | -10/+8 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2017-12-19 | 16 | -112/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2017-12-15 | 4 | -168/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2017-12-08 | 3 | -1/+9 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Run autoconf from top-level directory. | Carlos O'Ryan | 2017-12-03 | 1 | -30/+59 |
* | | | | | | | | upstreaming cl 124976692 | Gennadiy Civil | 2018-01-03 | 17 | -128/+11 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #1374 from davidben/tuple-msvc | Gennadiy Civil | 2018-01-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into tuple-msvcrefs/pull/1374/head | Gennadiy Civil | 2018-01-03 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Fix testing::Combine on MSVC 2017. | David Benjamin | 2018-01-02 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #991 from davidben/uintptr | Gennadiy Civil | 2018-01-03 | 1 | -7/+2 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into uintptrrefs/pull/991/head | Gennadiy Civil | 2018-01-02 | 104 | -13642/+2499 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | Pass MSVC's C4826 warning. | David Benjamin | 2017-08-07 | 1 | -7/+2 |
* | | | | | | | | OSS Sync, cl 163329677refs/pull/1376/head | misterg | 2018-01-02 | 1 | -2/+6 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Avoid warning C4619 in MSVC 2017.refs/pull/1109/head | David Benjamin | 2017-12-25 | 1 | -0/+4 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Re-enable MSVC++ C4389 warning in CmdHelperEq()refs/pull/778/head | Gregory Pakosz | 2017-12-21 | 1 | -2/+0 |
* | | | | | | Update internal_utils.cmakerefs/pull/1357/head | bryanzim | 2017-12-20 | 1 | -2/+1 |
* | | | | | | Merge branch 'master' into master | bryanzim | 2017-12-20 | 16 | -112/+4 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Update gtest-param-test.h.pumprefs/pull/1248/head | Gennadiy Civil | 2017-12-19 | 1 | -3/+0 |
| * | | | | | Update gtest-param-test.h.pump | Gennadiy Civil | 2017-12-19 | 1 | -0/+3 |
| * | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-18 | 3 | -166/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-09 | 3 | -3/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-01 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-11-07 | 6 | -25/+73 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-10-04 | 12 | -13/+13 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-24 | 8 | -153/+175 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-08 | 3 | -6/+11 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | remove GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-04 | 16 | -112/+4 |
* | | | | | | | | | | | Merge branch 'master' into master | bryanzim | 2017-12-15 | 3 | -166/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix...refs/pull/1354/head | Carlos O'Ryan | 2017-12-12 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Refactor docs about contributions to CONTRIBUTING.md. | Carlos O'Ryan | 2017-12-12 | 3 | -166/+1 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | |