aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/internal
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-051-0/+2
|\
| * Try to handle unsigned wchar_t (arm) a bit betterScott Graham2018-02-231-0/+2
| |
* | Merges-1Gennadiy Civil2018-03-051-4/+3
|/
* Code mergesGennadiy Civil2018-01-263-23/+59
|
* Use std::string and ::string explicitly in gtest and gmock code.Nico Weber2017-05-151-5/+4
| | | | | | | | | This merges a Google-internal change (117235625). Original CL description: This CL was created manually in about an hour with sed, a Python script to find all the places unqualified 'string' was mentioned, and some help from Emacs to add the "std::" qualifications, plus a few manual tweaks.
* move googlemock files into googlemock/ subdirBilly Donahue2015-08-258-0/+1120