aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix-argcConor Burgess2018-01-1284-917/+1031
|\
| * Update .travis.ymlGennadiy Civil2018-01-111-2/+0
| * Update .travis.ymlGennadiy Civil2018-01-111-2/+2
| * Update .travis.ymlGennadiy Civil2018-01-111-0/+2
| * Update .travis.ymlGennadiy Civil2018-01-111-4/+0
| * Merge pull request #1399 from gennadiycivil/masterGennadiy Civil2018-01-113-7/+33
| |\
| | * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-110-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #1398 from gennadiycivil/masterGennadiy Civil2018-01-112-7/+4
| |\ \
| | | * Upstream cl 103120214Gennadiy Civil2018-01-113-7/+33
| | |/
| | * More merge, cleanupGennadiy Civil2018-01-101-1/+1
| | * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-100-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #1397 from gennadiycivil/masterGennadiy Civil2018-01-105-59/+62
| |\ \
| | | * More merge, cleanupGennadiy Civil2018-01-102-8/+5
| | |/
| | * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-100-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #1396 from gennadiycivil/masterGennadiy Civil2018-01-102-3/+3
| |\ \
| * \ \ Merge pull request #1395 from gennadiycivil/masterGennadiy Civil2018-01-104-17/+13
| |\ \ \
| | | | * Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-105-59/+62
| | | |/
| | | * revertGennadiy Civil2018-01-101-68/+9
| | | * code merges, cleanupGennadiy Civil2018-01-103-12/+71
| | |/
| | * revert googletest/test/gtest-param-test_test.ccGennadiy Civil2018-01-101-46/+3
| | * Merge branch 'master' of github.com:gennadiycivil/googletestGennadiy Civil2018-01-100-0/+0
| | |\
| | | * Merge branch 'master' into masterGennadiy Civil2018-01-101-0/+6
| | | |\ | | |_|/ | |/| |
| | * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-101-0/+6
| | |\ \ | | |/ / | |/| / | | |/
| * | Update .travis.ymlGennadiy Civil2018-01-101-0/+6
| | * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-090-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #1394 from gennadiycivil/masterGennadiy Civil2018-01-094-51/+51
| |\ \
| | | * code merge, cleanupsGennadiy Civil2018-01-095-20/+59
| | |/
| | * Upstream of cl 129104714Gennadiy Civil2018-01-092-49/+50
| | * Revert one fileGennadiy Civil2018-01-091-2/+3
| | * wip, cleanups/mergeGennadiy Civil2018-01-093-5/+3
| |/
| * Merge pull request #1393 from gennadiycivil/masterGennadiy Civil2018-01-093-2/+4
| |\
| | * Merge branch 'master' into masterGennadiy Civil2018-01-093-7/+18
| | |\ | | |/ | |/|
| * | Merge pull request #1388 from rongjiecomputer/bazelGennadiy Civil2018-01-083-7/+18
| |\ \
| | * | [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcLoo Rong Jie2018-01-093-7/+18
| |/ /
| * | Merge pull request #1390 from gennadiycivil/masterGennadiy Civil2018-01-082-2/+5
| |\ \
| | | * cleanup, mergeGennadiy Civil2018-01-093-2/+4
| | |/
| | * Small cleanups, mergeGennadiy Civil2018-01-082-2/+5
| |/
| * Merge pull request #1387 from coryan/optimize-build-matrix-readyGennadiy Civil2018-01-082-1/+21
| |\
| | * Use correct name for build event types.Carlos O'Ryan2018-01-051-4/+4
| | * Fixed test for pull request.Carlos O'Ryan2018-01-051-2/+2
| | * Fixed output and test for 'enabled_on_pr'Carlos O'Ryan2018-01-051-6/+4
| | * Optimize build matrix (#1)Carlos O'Ryan2018-01-042-1/+23
| * | Merge pull request #1385 from gennadiycivil/masterGennadiy Civil2018-01-0611-16/+9
| |\ \
| | * \ Merge branch 'master' into masterGennadiy Civil2018-01-059-48/+56
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1007 from davidben/missing-declarationsGennadiy Civil2018-01-058-47/+55
| |\ \ \
| | * \ \ Merge branch 'master' into missing-declarationsGennadiy Civil2018-01-0428-170/+215
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1377 from davidben/clang-clGennadiy Civil2018-01-041-1/+1
| |\ \ \ \
| | * | | | Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.David Benjamin2018-01-031-1/+1
| | | * | | Pass the -Wmissing-declarations warning.David Benjamin2018-01-038-47/+55
| | |/ / /
| | | * | Revert one file for nowGennadiy Civil2018-01-051-10/+0