Commit Graph

8 Commits

Author SHA1 Message Date
Marco Bubke
7796273056 Merge 86fe8a25eb into 440527a61e
Closes #1867

PiperOrigin-RevId: 215392714
2018-10-02 13:03:35 -04:00
Gennadiy Civil
a3c0dd0f4d Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
984cba30ed Formatting changes for automatic code management 2018-07-27 11:15:08 -04:00
Masaru Tsuchiyama
4bcc9b9807 This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.
non-ASCII charactors are interpreted as Shift-JIS on the environment.
But the charators in the files are non Shift-JIS charactors and the compiler
stops compiling with C4819.

To fix the errors, remove non-ASCII charactors.
2018-06-30 21:46:41 +09:00
Gennadiy Civil
b539167cf0 merging, 2018-04-25 13:10:41 -04:00
Gennadiy Civil
fa658e0cc0 merging 2018-04-12 13:42:47 -04:00
Gennadiy Civil
fe402c2779 Merging gMock, 2 2018-04-05 16:09:17 -04:00
Billy Donahue
affb09edf0 move googlemock files into googlemock/ subdir 2015-08-25 17:47:18 -04:00