diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-10 15:57:16 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-10 15:57:16 -0400 |
| commit | e1071eb9497304a38e69737e90a88b4877b8b736 (patch) | |
| tree | a3f997e6412a22622588cb7e7468920678774054 /googlemock/include/gmock/internal/custom | |
| parent | d0de1180e44bb279361ebe3ce9ba3d860bdad4b2 (diff) | |
| download | googletest-e1071eb9497304a38e69737e90a88b4877b8b736.tar.gz googletest-e1071eb9497304a38e69737e90a88b4877b8b736.tar.bz2 googletest-e1071eb9497304a38e69737e90a88b4877b8b736.zip | |
RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
Diffstat (limited to 'googlemock/include/gmock/internal/custom')
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump index d26c8a08..03cfd8c5 100644 --- a/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump +++ b/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump @@ -1,5 +1,5 @@ $$ -*- mode: c++; -*- -$$ This is a Pump source file (http://go/pump). Please use Pump to convert +$$ This is a Pump source file. Please use Pump to convert $$ it to callback-actions.h. $$ $var max_callback_arity = 5 |