Masaru Tsuchiyama 40cd5d1170

Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp

2018-07-19 06:51:13 +09:00

..

internal

Formatting and a link

2018-07-18 11:17:19 -04: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

This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.

2018-06-30 21:46:41 +09:00

gmock-generated-function-mockers.h.pump

This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.

2018-06-30 21:46:41 +09: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

Fix gmock not building when -fno-rtti

2018-05-02 11:14:39 -07: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

merging,

2018-04-25 13:10:41 -04:00

gmock.h

Code merges

2018-01-26 11:57:58 -05:00