Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into uintptrrefs/pull/991/head | Gennadiy Civil | 2018-01-02 | 177 | -28909/+4138 |
|\ | |||||
| * | Merge pull request #1109 from davidben/vs2017 | Gennadiy Civil | 2018-01-02 | 1 | -0/+4 |
| |\ | |||||
| | * | Avoid warning C4619 in MSVC 2017.refs/pull/1109/head | David Benjamin | 2017-12-25 | 1 | -0/+4 |
| |/ | |||||
| * | Merge pull request #778 from gpakosz/C4389 | Gennadiy Civil | 2017-12-22 | 1 | -2/+0 |
| |\ | |||||
| | * | Re-enable MSVC++ C4389 warning in CmdHelperEq()refs/pull/778/head | Gregory Pakosz | 2017-12-21 | 1 | -2/+0 |
| |/ | |||||
| * | Merge pull request #1357 from bryanzim/master | Gennadiy Civil | 2017-12-20 | 2 | -13/+13 |
| |\ | |||||
| | * | Update internal_utils.cmakerefs/pull/1357/head | bryanzim | 2017-12-20 | 1 | -2/+1 |
| | * | Merge branch 'master' into master | bryanzim | 2017-12-20 | 17 | -115/+7 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #1248 from aninf-wo/hethi/issue-360-remove-GTEST_HAS_PARAM... | Gennadiy Civil | 2017-12-19 | 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 | 17 | -389/+502 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-09 | 6 | -6/+18 |
| | |\ \ \ | |||||
| | * \ \ \ | 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 | 14 | -47/+136 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-10-04 | 20 | -22/+22 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-24 | 10 | -163/+193 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-08 | 6 | -11/+42 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | remove GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-04 | 16 | -112/+4 |
| * | | | | | | | | | | Merge pull request #1212 from qzmfranklin/bazel | Gennadiy Civil | 2017-12-19 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into bazelrefs/pull/1212/head | Gennadiy Civil | 2017-12-18 | 108 | -1981/+3326 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into bazel | Gennadiy Civil | 2017-08-23 | 4 | -9/+71 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into bazel | Zhongming Qu | 2017-08-19 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Also can build when included in source. | Zhongming Qu | 2017-08-18 | 1 | -1/+1 |
| | * | | | | | | | | | | | Remove trailing whitespaces in BUILD.bazel | Zhongming Qu | 2017-08-18 | 1 | -2/+2 |
| | | | | | | | | | | | * | Merge branch 'master' into master | bryanzim | 2017-12-15 | 9 | -360/+193 |
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1354 from coryan/fix-top-level-license | Gennadiy Civil | 2017-12-15 | 9 | -360/+193 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix...refs/pull/1354/head | Carlos O'Ryan | 2017-12-12 | 10 | -33/+313 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-top-level-license | Gennadiy Civil | 2017-12-11 | 10 | -33/+313 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Refactor docs about contributions to CONTRIBUTING.md. | Carlos O'Ryan | 2017-12-12 | 8 | -364/+132 |
| | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Also add documentation around becoming a contributor. | Carlos O'Ryan | 2017-12-09 | 1 | -0/+37 |
| | * | | | | | | | | | | | | Wrong LICENSE file, sorry. Corrected. [skip ci] | Carlos O'Ryan | 2017-12-09 | 1 | -201/+28 |
| | * | | | | | | | | | | | | Add Apache-2.0 LICENSE file. | Carlos O'Ryan | 2017-12-08 | 1 | -0/+201 |
| | | | | | | | | | | | | * | Merge branch 'master' into master | bryanzim | 2017-12-11 | 8 | -29/+309 |
| | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1355 from coryan/blaze-build-travisrefs/pull/1360/head | Gennadiy Civil | 2017-12-11 | 8 | -29/+309 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into blaze-build-travisrefs/pull/1355/head | Gennadiy Civil | 2017-12-11 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Implement bazel-based builds in Travis. | Carlos O'Ryan | 2017-12-09 | 8 | -29/+309 |
| | |/ / / / / / / / / / / | |||||
| | | | | | | | | | | | * | remove extra line | Bryan Zimmerman | 2017-12-11 | 1 | -1/+0 |
| | | | | | | | | | | | * | remove implicit casts | Bryan Zimmerman | 2017-12-11 | 4 | -10/+8 |
| | | | | | | | | | | | * | Merge branch 'master' into masterrefs/pull/1311/head | bryanzim | 2017-12-11 | 2 | -4/+4 |
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1333 from sam-lunt/use-system-includes | Gennadiy Civil | 2017-12-09 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into use-system-includesrefs/pull/1333/head | Gennadiy Civil | 2017-12-08 | 6 | -2/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into use-system-includes | Gennadiy Civil | 2017-12-01 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | make includes system | Sam Lunt | 2017-11-27 | 2 | -4/+4 |
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
| | | | | | | | | | | * | Merge branch 'master' into master | bryanzim | 2017-12-08 | 1 | -0/+2 |
| | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1340 from coryan/fix-googlemock-test-build-file | Gennadiy Civil | 2017-12-08 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Add licenses() directive for googlemock/tests.refs/pull/1340/head | Carlos O'Ryan | 2017-12-08 | 1 | -0/+2 |
| |/ / / / / / / / / / / | |||||
| | | | | | | | | | | * | Merge branch 'master' into master | bryanzim | 2017-12-08 | 4 | -5/+7 |
| | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1345 from coryan/fix-travis-build-macOS | Gennadiy Civil | 2017-12-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix-travis-build-macOSrefs/pull/1345/head | Gennadiy Civil | 2017-12-08 | 3 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | |