Gennadiy Civil a79851f2c2 merging

2018-04-12 14:00:38 -04:00

..

internal

..and this should be it

2018-04-11 10:10:24 -04:00

gmock-actions.h

merging

2018-04-11 15:33:31 -04:00

gmock-cardinalities.h

…

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

Merging gMock, 2

2018-04-05 16:09:17 -04:00

gmock-generated-function-mockers.h.pump

merging

2018-04-12 13:42:47 -04:00

gmock-generated-matchers.h

…

gmock-generated-matchers.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-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

Upstream cl/192179348

2018-04-11 15:24:04 -04:00

gmock-more-actions.h

…

gmock-more-matchers.h

small cleanup

2018-04-12 09:12:02 -04:00

gmock-spec-builders.h

Remove multiple inheritance from "unintesting call" mock classes.

2018-04-12 00:48:30 -07:00

gmock.h

Code merges

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