6 Commits

Author	SHA1	Message	Date
Gennadiy Civil	78eb71c7e3	merge, again, IsRecursiveContainer	2018-03-15 14:31:37 -04:00
Gennadiy Civil	05c81235a1	Code merges	2018-01-26 11:57:58 -05:00
Jonathan Wakely	c61e22b1fe	Use gender-neutral pronouns in comments and docs	2017-09-27 13:31:13 +01:00
Alyssa Wilk	10232c3adb	Adding a flag option to change the default mock type	2017-08-10 09:41:09 -04:00
Nico Weber	3ec8d72fc1	Use std::string and ::string explicitly in gtest and gmock code. ... 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.	2017-05-15 17:53:04 -04:00
Billy Donahue	affb09edf0	move googlemock files into googlemock/ subdir	2015-08-25 17:47:18 -04:00