diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-05-05 19:53:33 +0100 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-05-05 19:53:33 +0100 |
| commit | 10f05a627c2da8d7de78da1b08f984ce8de398fb (patch) | |
| tree | 4f799952ac6fa35647a653cc12caf42efd73e005 /googlemock/include/gmock/internal/custom | |
| parent | 5c7c365d5f3e5467de350f2e81a31407a3f52505 (diff) | |
| parent | 278aba369c41e90e9e77a6f51443beb3692919cf (diff) | |
| download | googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.tar.gz googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.tar.bz2 googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
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 |