4 Commits

Author	SHA1	Message	Date
Gennadiy Civil	ed1edf641d	Formatting changes, code sync	2018-07-25 10:24:13 -04:00
Gennadiy Civil	fbb48a7708	Code merges	2018-01-26 11:57:58 -05:00
Nico Weber	09fd5b3ebf	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