aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into variant_matcherXiaoyi Zhang2018-02-271-44/+187
|\
| * gmock merging -2Gennadiy Civil2018-02-271-44/+187
* | Add matcher for std::variant.Xiaoyi Zhang2018-02-271-0/+71
|/
* moving JoinAsTuple to internalGennadiy Civil2018-02-121-4/+0
* Fixed typosTroy Holsapple2018-02-071-2/+2
* Code mergesGennadiy Civil2018-01-267-31/+81
* Pass the -Wmissing-declarations warning.David Benjamin2018-01-031-0/+4
* Remove gcc 6 misleading indentations.Romain Geissler2017-10-252-13/+26
* Use gender-neutral pronouns in comments and docsJonathan Wakely2017-09-271-1/+1
* change links from former code.google.com to current github repositoryHerbert Thielen2017-08-314-4/+4
* Merge branch 'refs/heads/master' into flag-defaultAlyssa Wilk2017-08-281-8/+27
|\
| * Support ref-qualified member functions in Property().Roman Perepelitsa2017-08-221-8/+27
* | Adding a flag option to change the default mock typeAlyssa Wilk2017-08-102-1/+1
|/
* Merge pull request #1123 from chromy/upstream-141765019Gennadiy Civil2017-08-081-4/+4
|\
| * Fix typo in gmock-actions.hHector Dearman2017-06-191-4/+4
* | Fixed misspelling in assertion message.Hector Dearman2017-06-191-1/+1
|/
* Use std::string and ::string explicitly in gtest and gmock code.Nico Weber2017-05-153-90/+90
* googlemock: Support C++11 language with pre-C++11 libraryMark Mentovai2015-10-121-4/+4
* move googlemock files into googlemock/ subdirBilly Donahue2015-08-2523-0/+17082