summaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Added "explicit" as per compiler suggestionGennadiy Civil2017-08-201-1/+1
| * | | Proposing these changes, please reviewGennadiy Civil2017-08-201-12/+9
| * | | Change tabs to spaces in test caseMaurice Gilden2017-08-181-11/+11
| * | | Switch return type to class without default constructorMaurice Gilden2017-08-181-1/+7
| * | | Fix test if exceptions are not supportedMaurice Gilden2017-08-181-0/+6
| * | | adds test for NiceMock with unknown return valueMaurice Gilden2017-08-181-0/+15
| * | | Add function name to exception if there's no default actionMaurice Gilden2017-08-161-1/+1
| * | | Add support for pkgconfigDavid Seifert2017-08-143-1/+36
| * | | Merge pull request #926 from bartshappee/patch-1Gennadiy Civil2017-08-111-1/+1
| |\ \ \
| | * | | Fix small typo SeArrayArgumentrefs/pull/926/headbartshappee2016-11-071-1/+1
| | | |/ | | |/|
| * | | Merge pull request #1160 from mwoehlke-kitware/honor-lib_suffixGennadiy Civil2017-08-111-4/+8
| |\ \ \
| | * | | Fix library install destinationsrefs/pull/1160/headMatthew Woehlke2017-08-091-4/+8
| * | | | Merge pull request #957 from sglass68/simGennadiy Civil2017-08-111-2/+2
| |\ \ \ \
| | * | | | Fix a few documentation nits in the mock dummies guiderefs/pull/957/headSimon Glass2016-12-081-2/+2
| | | |/ / | | |/| |
| * | | | Merge pull request #1164 from aninf-wo/hethi/remove-old-docsGennadiy Civil2017-08-1116-14883/+6
| |\ \ \ \
| | * | | | say "former version" instead of "released version"refs/pull/1164/headHerbert Thielen2017-08-101-1/+1
| | * | | | Merge branch 'master' into hethi/remove-old-docsHerbert Thielen2017-08-099-18/+52
| | |\ \ \ \
| | * | | | | remove doc of former versionsHerbert Thielen2017-07-3015-14880/+0
| | * | | | | remove obsolete reference to SVN trunk and fix link to pump manualHerbert Thielen2017-07-301-3/+6
| * | | | | | Merge pull request #1192 from eduherminio/masterGennadiy Civil2017-08-111-1/+1
| |\ \ \ \ \ \
| | * | | | | | Minor style fixesrefs/pull/1192/headEduardo Caceres2017-08-101-1/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #1191 from gennadiycivil/masterGennadiy Civil2017-08-111-0/+52
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Added Copyrightmisterg2017-08-101-4/+31
| | * | | | | Initial Revision, review 164634031misterg2017-08-101-25/+0
| | * | | | | WIPrefs/pull/1190/headmisterg2017-08-091-0/+25
| | * | | | | Added googlemock testsmisterg2017-08-091-4/+0
| | * | | | | Added googlemock testsmisterg2017-08-091-0/+29
* | | | | | | Handling invalid flag valuesAlyssa Wilk2017-08-162-1/+28
* | | | | | | Adding a flag option to change the default mock typeAlyssa Wilk2017-08-106-3/+102
|/ / / / / /
* | | | | | Merge pull request #1123 from chromy/upstream-141765019Gennadiy Civil2017-08-081-4/+4
|\ \ \ \ \ \
| * | | | | | Fix typo in gmock-actions.hrefs/pull/1123/headHector Dearman2017-06-191-4/+4
* | | | | | | Merge pull request #1122 from chromy/upstream-146491438Gennadiy Civil2017-08-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed misspelling in assertion message.refs/pull/1122/headHector Dearman2017-06-191-1/+1
| |/ / / / / /