Masaru Tsuchiyama 534570b5bd Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp		2018-07-21 09:18:54 +09:00
..
internal	Merge branch 'master' into googletest_for_asam	2018-07-19 18:38:20 +08:00
gmock-actions.h	merging	2018-04-11 15:33:31 -04:00
gmock-cardinalities.h	move googlemock files into googlemock/ subdir	2015-08-25 17:47:18 -04:00
gmock-generated-actions.h	RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR	2018-04-10 15:57:16 -04:00
gmock-generated-actions.h.pump	RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR	2018-04-10 15:57:16 -04:00
gmock-generated-function-mockers.h	Fix warning C4819: The file contains a character that cannot be represented in the current code page (936). Save the file in Unicode format to prevent data loss	2018-07-17 15:46:47 +08:00
gmock-generated-function-mockers.h.pump	Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio	2018-07-20 06:15:13 +08:00
gmock-generated-matchers.h	test-meerging	2018-04-16 15:52:47 -04:00
gmock-generated-matchers.h.pump	merging gmock generated matchers	2018-04-16 11:18:49 -04:00
gmock-generated-nice-strict.h	merging	2018-04-12 14:00:38 -04:00
gmock-generated-nice-strict.h.pump	merging	2018-04-12 14:00:38 -04:00
gmock-matchers.h	code merge	2018-07-20 11:28:58 -04:00
gmock-more-actions.h	move googlemock files into googlemock/ subdir	2015-08-25 17:47:18 -04:00
gmock-more-matchers.h	small cleanup	2018-04-12 09:12:02 -04:00
gmock-spec-builders.h	Fix warning C4819: The file contains a character that cannot be represented in the current code page (936). Save the file in Unicode format to prevent data loss	2018-07-17 15:46:47 +08:00
gmock.h	Code merges	2018-01-26 11:57:58 -05:00