summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
* continue upstream/merge, etcrefs/pull/1400/headGennadiy Civil2018-01-111-4/+4
* Upstream cl 103120214Gennadiy Civil2018-01-113-7/+33
* More merge, cleanuprefs/pull/1398/headGennadiy Civil2018-01-101-1/+1
* More merge, cleanupGennadiy Civil2018-01-102-8/+5
* Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-105-59/+62
* revertrefs/pull/1396/headGennadiy Civil2018-01-101-68/+9
* code merges, cleanupGennadiy Civil2018-01-103-12/+71
* revert googletest/test/gtest-param-test_test.ccrefs/pull/1395/headGennadiy Civil2018-01-101-46/+3
* code merge, cleanupsGennadiy Civil2018-01-105-20/+59
* Upstream of cl 129104714refs/pull/1394/headGennadiy Civil2018-01-092-49/+50
* Revert one fileGennadiy Civil2018-01-091-2/+3
* wip, cleanups/mergeGennadiy Civil2018-01-093-5/+3
* Merge branch 'master' into masterrefs/pull/1393/headGennadiy Civil2018-01-091-3/+6
|\
| * [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcrefs/pull/1388/headLoo Rong Jie2018-01-091-3/+6
* | cleanup, mergeGennadiy Civil2018-01-093-2/+4
|/
* Small cleanups, mergerefs/pull/1390/headGennadiy Civil2018-01-082-2/+5
* Merge branch 'master' into masterrefs/pull/1385/headGennadiy Civil2018-01-056-43/+51
|\
| * Merge branch 'master' into missing-declarationsrefs/pull/1007/headGennadiy Civil2018-01-0519-159/+71
| |\
| | * Merge pull request #1377 from davidben/clang-clGennadiy Civil2018-01-051-1/+1
| | |\
| | | * Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.refs/pull/1377/headDavid Benjamin2018-01-031-1/+1
| * | | Pass the -Wmissing-declarations warning.David Benjamin2018-01-035-42/+50
| | |/ | |/|
* | | Revert one file for nowGennadiy Civil2018-01-051-10/+0
* | | code cleanup in preparation for merges, cl 180857299Gennadiy Civil2018-01-0512-16/+19
| |/ |/|
* | Merge branch 'master' into masterrefs/pull/1378/headGennadiy Civil2018-01-041-30/+59
|\ \
| * \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submodulerefs/pull/1341/headGennadiy Civil2018-01-032-8/+3
| |\ \ | | |/
| * | Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2018-01-032-2/+10
| |\ \
| * \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-222-10/+8
| |\ \ \
| * \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-1916-112/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-154-168/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-083-1/+9
| |\ \ \ \ \ \
| * | | | | | | Run autoconf from top-level directory.Carlos O'Ryan2017-12-031-30/+59
* | | | | | | | upstreaming cl 124976692Gennadiy Civil2018-01-0317-128/+11
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #1374 from davidben/tuple-msvcGennadiy Civil2018-01-031-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into tuple-msvcrefs/pull/1374/headGennadiy Civil2018-01-031-2/+6
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Fix testing::Combine on MSVC 2017.David Benjamin2018-01-021-1/+1
* | | | | | | | Merge pull request #991 from davidben/uintptrGennadiy Civil2018-01-031-7/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into uintptrrefs/pull/991/headGennadiy Civil2018-01-02104-13642/+2499
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Pass MSVC's C4826 warning.David Benjamin2017-08-071-7/+2
* | | | | | | | OSS Sync, cl 163329677refs/pull/1376/headmisterg2018-01-021-2/+6
| |/ / / / / / |/| | | | | |
* | | | | | | Avoid warning C4619 in MSVC 2017.refs/pull/1109/headDavid Benjamin2017-12-251-0/+4
| |_|_|_|_|/ |/| | | | |
* | | | | | Re-enable MSVC++ C4389 warning in CmdHelperEq()refs/pull/778/headGregory Pakosz2017-12-211-2/+0
* | | | | | Update internal_utils.cmakerefs/pull/1357/headbryanzim2017-12-201-2/+1
* | | | | | Merge branch 'master' into masterbryanzim2017-12-2016-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-183-166/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-093-3/+11
| |\ \ \ \ \
| * \ \ \ \ \ 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-076-25/+73
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-0412-13/+13
| |\ \ \ \ \ \ \