aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | 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
| | | | | | | | | | | | * | | 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...Carlos O'Ryan2017-12-1110-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-118-364/+132
| | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Also add documentation around becoming a contributor.Carlos O'Ryan2017-12-081-0/+37
| | * | | | | | | | | | | | | | Wrong LICENSE file, sorry. Corrected. [skip ci]Carlos O'Ryan2017-12-081-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-travisGennadiy Civil2017-12-118-29/+309
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' into blaze-build-travisGennadiy Civil2017-12-112-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Implement bazel-based builds in Travis.Carlos O'Ryan2017-12-088-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 pull request #1333 from sam-lunt/use-system-includesGennadiy Civil2017-12-092-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' into use-system-includesGennadiy 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.Carlos O'Ryan2017-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-core-dump-sharedGennadiy Civil2017-12-085-2/+12
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1345 from coryan/fix-travis-build-macOSGennadiy Civil2017-12-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-travis-build-macOSGennadiy Civil2017-12-083-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #1348 from wmamrak/masterGennadiy Civil2017-12-083-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Remove C4996 warning in VS2017Wojciech Mamrak2017-12-071-0/+3
| | * | | | | | | | | | | | | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-0/+2
| | * | | | | | | | | | | | | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-0/+2
| |/ / / / / / / / / / / / /
| | * / / / / / / / / / / / Only switch to g++-4.9 on Linux.Carlos O'Ryan2017-12-061-1/+1
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #1225 from brian-peloton/masterGennadiy Civil2017-12-051-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |