Xiaoyi Zhang 576d689c19 Merge branch 'master' into variant_matcher

2018-02-27 16:03:36 -05:00

..

internal

Code merges

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

gmock-actions.h

Fix typo in gmock-actions.h

2017-06-19 18:43:55 +01:00

gmock-cardinalities.h

…

gmock-generated-actions.h

change links from former code.google.com to current github repository

2017-08-31 18:12:17 +02:00

gmock-generated-actions.h.pump

change links from former code.google.com to current github repository

2017-08-31 18:12:17 +02:00

gmock-generated-function-mockers.h

…

gmock-generated-function-mockers.h.pump

…

gmock-generated-matchers.h

Remove gcc 6 misleading indentations.

2017-10-25 17:53:01 +02:00

gmock-generated-matchers.h.pump

Remove gcc 6 misleading indentations.

2017-10-25 17:53:01 +02:00

gmock-generated-nice-strict.h

…

gmock-generated-nice-strict.h.pump

…

gmock-matchers.h

Merge branch 'master' into variant_matcher

2018-02-27 16:03:36 -05:00

gmock-more-actions.h

…

gmock-more-matchers.h

Code merges

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

gmock-spec-builders.h

Code merges

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

gmock.h

Code merges

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