106 Commits

Author	SHA1	Message	Date
Gennadiy Civil	a518bd5cf2	Merge branch 'master' of https://github.com/google/googletest	2018-03-05 12:26:24 -05:00
Gennadiy Civil	0d5e01ad7b	Merges-1	2018-03-05 12:26:15 -05:00
Scott Graham	567b40eeb1	Try to handle unsigned wchar_t (arm) a bit better	2018-02-23 12:28:09 -08: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