summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into uintptrrefs/pull/991/headGennadiy Civil2018-01-02177-28909/+4138
|\
| * Merge pull request #1109 from davidben/vs2017Gennadiy Civil2018-01-021-0/+4
| |\
| | * Avoid warning C4619 in MSVC 2017.refs/pull/1109/headDavid Benjamin2017-12-251-0/+4
| |/
| * Merge pull request #778 from gpakosz/C4389Gennadiy Civil2017-12-221-2/+0
| |\
| | * Re-enable MSVC++ C4389 warning in CmdHelperEq()refs/pull/778/headGregory Pakosz2017-12-211-2/+0
| |/
| * Merge pull request #1357 from bryanzim/masterGennadiy Civil2017-12-202-13/+13
| |\
| | * Update internal_utils.cmakerefs/pull/1357/headbryanzim2017-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.pumprefs/pull/1248/headGennadiy 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 bazelrefs/pull/1212/headGennadiy Civil2017-12-18108-1981/+3326
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into bazelGennadiy Civil2017-08-234-9/+71
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into bazelZhongming Qu2017-08-191-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
| | | | | | | | | | | | * Merge branch 'master' into masterbryanzim2017-12-159-360/+193
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1354 from coryan/fix-top-level-licenseGennadiy Civil2017-12-159-360/+193
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix...refs/pull/1354/headCarlos O'Ryan2017-12-1210-33/+313
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-top-level-licenseGennadiy Civil2017-12-1110-33/+313
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Refactor docs about contributions to CONTRIBUTING.md.Carlos O'Ryan2017-12-128-364/+132
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Also add documentation around becoming a contributor.Carlos O'Ryan2017-12-091-0/+37
| | * | | | | | | | | | | | Wrong LICENSE file, sorry. Corrected. [skip ci]Carlos O'Ryan2017-12-091-201/+28
| | * | | | | | | | | | | | Add Apache-2.0 LICENSE file.Carlos O'Ryan2017-12-081-0/+201
| | | | | | | | | | | | | * Merge branch 'master' into masterbryanzim2017-12-118-29/+309
| | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1355 from coryan/blaze-build-travisrefs/pull/1360/headGennadiy Civil2017-12-118-29/+309
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into blaze-build-travisrefs/pull/1355/headGennadiy Civil2017-12-112-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Implement bazel-based builds in Travis.Carlos O'Ryan2017-12-098-29/+309
| | |/ / / / / / / / / / /
| | | | | | | | | | | | * remove extra lineBryan Zimmerman2017-12-111-1/+0
| | | | | | | | | | | | * remove implicit castsBryan Zimmerman2017-12-114-10/+8
| | | | | | | | | | | | * Merge branch 'master' into masterrefs/pull/1311/headbryanzim2017-12-112-4/+4
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1333 from sam-lunt/use-system-includesGennadiy Civil2017-12-092-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into use-system-includesrefs/pull/1333/headGennadiy Civil2017-12-086-2/+14
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into use-system-includesGennadiy Civil2017-12-011-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | * | | | | | | | | | | make includes systemSam Lunt2017-11-272-4/+4
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | | | | | | | | | | * Merge branch 'master' into masterbryanzim2017-12-081-0/+2
| | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1340 from coryan/fix-googlemock-test-build-fileGennadiy Civil2017-12-081-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add licenses() directive for googlemock/tests.refs/pull/1340/headCarlos O'Ryan2017-12-081-0/+2
| |/ / / / / / / / / / /
| | | | | | | | | | | * Merge branch 'master' into masterbryanzim2017-12-084-5/+7
| | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1345 from coryan/fix-travis-build-macOSGennadiy Civil2017-12-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-travis-build-macOSrefs/pull/1345/headGennadiy Civil2017-12-083-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |