summaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Expand)AuthorAgeFilesLines
* Adding tests to googlemock bazelrefs/pull/1430/headGennadiy Civil2018-01-262-6/+72
* Code mergesGennadiy Civil2018-01-269-34/+86
* Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2018-01-0910-187/+18
|\
| * [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcrefs/pull/1388/headLoo Rong Jie2018-01-091-1/+2
| * Merge branch 'master' into missing-declarationsrefs/pull/1007/headGennadiy Civil2018-01-052-9/+1
| |\
| | * Merge branch 'master' into masterrefs/pull/1378/headGennadiy Civil2018-01-041-1/+1
| | |\
| | | * Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-221-5/+5
| | | |\
| | | * \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-155-167/+5
| | | |\ \
| | | * \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-081-0/+2
| | | |\ \ \
| | | * | | | Run autoconf from top-level directory.Carlos O'Ryan2017-12-031-1/+1
| | * | | | | upstreaming cl 124976692Gennadiy Civil2018-01-031-8/+0
| | | |_|_|/ | | |/| | |
| * | | | | Pass the -Wmissing-declarations warning.David Benjamin2018-01-033-5/+5
| |/ / / /
| * | | | Merge branch 'master' into masterbryanzim2017-12-153-165/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix...refs/pull/1354/headCarlos O'Ryan2017-12-121-2/+2
| | |\ \ \
| | * | | | Refactor docs about contributions to CONTRIBUTING.md.Carlos O'Ryan2017-12-123-165/+1
| * | | | | remove extra lineBryan Zimmerman2017-12-111-1/+0
| * | | | | remove implicit castsBryan Zimmerman2017-12-111-5/+4
| * | | | | Merge branch 'master' into masterrefs/pull/1311/headbryanzim2017-12-111-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'master' into use-system-includesrefs/pull/1333/headGennadiy Civil2017-12-082-0/+4
| | |\ \ \ \ | | | |/ / /
| | * | | | make includes systemSam Lunt2017-11-271-2/+2
| | | |/ / | | |/| |
| * | | | Merge branch 'master' into masterbryanzim2017-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-081-1/+2
| |\ \ \ | | |/ /
| * | | fix for VS2017 deprecation of ::tr1::tupleBryan Zimmerman2017-10-272-9/+12
| | |/ | |/|
* | | Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2017-12-081-0/+2
|\ \ \ | | |/ | |/|
| * | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-0/+2
| |/
* | Fix double free when building Gtest/GMock in shared libraries and linking a t...Romain Geissler2017-12-021-23/+40
|/
* Remove gcc 6 misleading indentations.refs/pull/913/headRomain Geissler2017-10-252-13/+26
* Fix gmock tests when std::unary_function unavailablerefs/pull/1218/headArkady Shapkin2017-10-251-2/+5
* Fix tests with VS2015 and VS2017Arkadiy Shapkin2017-10-252-4/+9
* #1282: Doc typo fixrefs/pull/1292/headDariusz Ostolski2017-10-141-1/+1
* Use gender-neutral pronouns in comments and docsrefs/pull/1275/headJonathan Wakely2017-09-278-9/+9
* Fix ellipsis position in examplesAlex Yursha2017-09-091-8/+16
* Merge pull request #975 from LebedevRI/respect-optionGennadiy Civil2017-09-051-1/+1
|\
| * CMake: use threads if allowed and found, not just if found.refs/pull/975/headRoman Lebedev2017-09-011-1/+1
* | Merge pull request #900 from Gallaecio/patch-1Gennadiy Civil2017-09-011-1/+1
|\ \ | |/ |/|
| * Fix WhenSorted() documentation examplerefs/pull/900/headGallaecio2016-10-081-1/+1
* | Merge pull request #1011 from zeitounator/wrong-version-reportedGennadiy Civil2017-09-011-2/+2
|\ \
| * \ Merge branch 'master' into wrong-version-reportedrefs/pull/1011/headGennadiy Civil2017-08-2143-15316/+604
| |\ \
| * | | googlemock version must be changed as wellOlivier Clavel2017-02-131-2/+2
* | | | change links from former code.google.com to current github repositoryrefs/pull/1241/headHerbert Thielen2017-08-317-10/+10
* | | | use plural verb as mentioned in issue #1105refs/pull/1233/headHerbert Thielen2017-08-291-1/+1
* | | | remove Yob's comma mentioned in issue #1105Herbert Thielen2017-08-291-1/+1
* | | | Applying lint checks from upstream google3refs/pull/1189/headAlyssa Wilk2017-08-281-4/+7
* | | | Merge branch 'refs/heads/master' into flag-defaultAlyssa Wilk2017-08-2836-14930/+630
|\ \ \ \
| * | | | Support x64 configuration for old VS2015 projectsArkady Shapkin2017-08-244-7/+216
| * | | | Merge branch 'master' into vs-projects-fixrefs/pull/1219/headGennadiy Civil2017-08-232-8/+47
| |\ \ \ \
| | * | | | Support ref-qualified member functions in Property().refs/pull/1220/headRoman Perepelitsa2017-08-222-8/+47
| | | |/ / | | |/| |
| * | | | Support x64 configuration for old VS2010 projectsArkady Shapkin2017-08-225-22/+237
| |/ / /
| * | | Remove unused variablerefs/pull/1206/headMaurice Gilden2017-08-211-1/+0