summaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | 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
| |/ / / / /
* | | | | | Correct some typos in a commentrefs/pull/1173/headShlomi Fish2017-08-041-1/+1
* | | | | | Merge pull request #1042 from danilcha/patch-1Gennadiy Civil2017-08-031-3/+36
|\ \ \ \ \ \
| * | | | | | Again rewrote everythingrefs/pull/1042/headdanilcha2017-03-121-12/+24
| * | | | | | Added explicit gtest library dependencydanilcha2017-03-121-1/+1
| * | | | | | Update README.mddanilcha2017-03-111-2/+2
| * | | | | | Update README.mddanilcha2017-03-111-3/+24
* | | | | | | Merge pull request #867 from marzojr/patch-1Gennadiy Civil2017-08-021-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Clarifying languagerefs/pull/867/headMarzo Sette Torres Junior2016-09-021-2/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #764 from flyd1005/wip-fix-typoGennadiy Civil2017-08-023-3/+3
|\ \ \ \ \ \ \
| * | | | | | | remove duplicated wordsrefs/pull/764/headLi Peng2016-04-273-3/+3
* | | | | | | | Merge pull request #998 from dawikur/patch-1Gennadiy Civil2017-08-021-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Replace html entities with their equivalentsrefs/pull/998/headDawid Kurek2017-02-061-2/+2
* | | | | | | | Merge pull request #1167 from krizalys/fix-typoGennadiy Civil2017-07-311-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed typorefs/pull/1167/headChristophe Vidal2017-07-311-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | fix links to Google C++ Style Guiderefs/pull/1165/headHerbert Thielen2017-07-302-2/+2
|/ / / / / / /