Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | More merges, removing old dead code | Gennadiy Civil | 2018-03-13 | 2 | -7/+8 |
* | merges-2 | Gennadiy Civil | 2018-03-05 | 2 | -4/+14 |
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-03-05 | 2 | -0/+6 |
|\ | |||||
| * | Merge branch 'master' into unsigned-wchar | Gennadiy Civil | 2018-03-01 | 5 | -123/+465 |
| |\ | |||||
| * | | Try to handle unsigned wchar_t (arm) a bit better | Scott Graham | 2018-02-23 | 2 | -0/+6 |
* | | | Merges-1 | Gennadiy Civil | 2018-03-05 | 2 | -4/+5 |
| |/ |/| | |||||
* | | Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest in... | Xiaoyi Zhang | 2018-02-27 | 3 | -123/+328 |
|\ \ | |||||
| * \ | Merge branch 'master' into variant_matcher | Xiaoyi Zhang | 2018-02-27 | 3 | -123/+328 |
| |\ \ | |||||
| | * | | gmock merging -2 | Gennadiy Civil | 2018-02-27 | 3 | -123/+328 |
| | |/ | |||||
* | / | Add documentation for VariantWith. | Xiaoyi Zhang | 2018-02-27 | 1 | -0/+2 |
|/ / | |||||
* / | Add matcher for std::variant. | Xiaoyi Zhang | 2018-02-27 | 2 | -0/+135 |
|/ | |||||
* | moving JoinAsTuple to internal | Gennadiy Civil | 2018-02-12 | 4 | -49/+22 |
* | Merge pull request #1446 from tholsapp/master | Gennadiy Civil | 2018-02-09 | 5 | -13/+13 |
|\ | |||||
| * | Fixed typos | Troy Holsapple | 2018-02-07 | 5 | -13/+13 |
* | | merges | Gennadiy Civil | 2018-02-09 | 2 | -8/+11 |
|/ | |||||
* | Adding tests to googlemock bazel | Gennadiy Civil | 2018-01-26 | 2 | -6/+72 |
* | Code merges | Gennadiy Civil | 2018-01-26 | 9 | -34/+86 |
* | Merge branch 'master' into fix-core-dump-shared | Gennadiy Civil | 2018-01-09 | 10 | -187/+18 |
|\ | |||||
| * | [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc | Loo Rong Jie | 2018-01-09 | 1 | -1/+2 |
| * | Merge branch 'master' into missing-declarations | Gennadiy Civil | 2018-01-04 | 2 | -9/+1 |
| |\ | |||||
| | * | Merge branch 'master' into master | Gennadiy Civil | 2018-01-04 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2017-12-22 | 1 | -5/+5 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2017-12-15 | 5 | -167/+5 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule | Gennadiy Civil | 2017-12-08 | 1 | -0/+2 |
| | | |\ \ \ | |||||
| | | * | | | | Run autoconf from top-level directory. | Carlos O'Ryan | 2017-12-03 | 1 | -1/+1 |
| | * | | | | | upstreaming cl 124976692 | Gennadiy Civil | 2018-01-03 | 1 | -8/+0 |
| | | |_|_|/ | | |/| | | | |||||
| * / | | | | Pass the -Wmissing-declarations warning. | David Benjamin | 2018-01-03 | 3 | -5/+5 |
| |/ / / / | |||||
| * | | | | Merge branch 'master' into master | bryanzim | 2017-12-15 | 3 | -165/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix... | Carlos O'Ryan | 2017-12-11 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | * | | | | Refactor docs about contributions to CONTRIBUTING.md. | Carlos O'Ryan | 2017-12-11 | 3 | -165/+1 |
| * | | | | | remove extra line | Bryan Zimmerman | 2017-12-11 | 1 | -1/+0 |
| * | | | | | remove implicit casts | Bryan Zimmerman | 2017-12-11 | 1 | -5/+4 |
| * | | | | | Merge branch 'master' into master | bryanzim | 2017-12-11 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch 'master' into use-system-includes | Gennadiy Civil | 2017-12-08 | 2 | -0/+4 |
| | |\| | | | |||||
| | * | | | | make includes system | Sam Lunt | 2017-11-27 | 1 | -2/+2 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'master' into master | bryanzim | 2017-12-08 | 1 | -0/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Add licenses() directive for googlemock/tests. | Carlos O'Ryan | 2017-12-08 | 1 | -0/+2 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into master | bryanzim | 2017-12-08 | 1 | -1/+2 |
| |\| | | |||||
| * | | | fix for VS2017 deprecation of ::tr1::tuple | Bryan Zimmerman | 2017-10-27 | 2 | -9/+12 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into fix-core-dump-shared | Gennadiy Civil | 2017-12-08 | 1 | -0/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Improved description of VS std::tuple support | Wojciech Mamrak | 2017-12-07 | 1 | -0/+2 |
| |/ | |||||
* / | Fix double free when building Gtest/GMock in shared libraries and linking a t... | Romain Geissler | 2017-12-02 | 1 | -23/+40 |
|/ | |||||
* | Remove gcc 6 misleading indentations. | Romain Geissler | 2017-10-25 | 2 | -13/+26 |
* | Fix gmock tests when std::unary_function unavailable | Arkady Shapkin | 2017-10-25 | 1 | -2/+5 |
* | Fix tests with VS2015 and VS2017 | Arkadiy Shapkin | 2017-10-25 | 2 | -4/+9 |
* | #1282: Doc typo fix | Dariusz Ostolski | 2017-10-14 | 1 | -1/+1 |
* | Use gender-neutral pronouns in comments and docs | Jonathan Wakely | 2017-09-27 | 8 | -9/+9 |
* | Fix ellipsis position in examples | Alex Yursha | 2017-09-08 | 1 | -8/+16 |
* | Merge pull request #975 from LebedevRI/respect-option | Gennadiy Civil | 2017-09-05 | 1 | -1/+1 |
|\ | |||||
| * | CMake: use threads if allowed and found, not just if found. | Roman Lebedev | 2017-09-01 | 1 | -1/+1 |