commit 6e1087218be351ce67af53328ccd5d97c8b8c169
author kosak <kosak@google.com> Tue Jul 28 00:53:13 2015 +0000
committer kosak <kosak@google.com> Tue Jul 28 00:53:13 2015 +0000
tree f2260edc093ffec7cf9715e787ee83e26f99dd36
parent 01db9d469ba113cee5040ba65bb98b2cb04c8583

Rename custom/callback-actions.h[.pump] =>
    custom/gmock-generated-actions.h[.pump].

include/gmock/gmock-generated-actions.h

diff --git a/include/gmock/gmock-generated-actions.h b/include/gmock/gmock-generated-actions.h
index f96b809..b5a889c 100644
--- a/include/gmock/gmock-generated-actions.h
+++ b/include/gmock/gmock-generated-actions.h
@@ -2369,9 +2369,9 @@
 
 }  // namespace testing
 
-// Include any custom callback actions added by the local installation.
+// Include any custom actions added by the local installation.
 // We must include this header at the end to make sure it can use the
 // declarations from this file.
-#include "gmock/internal/custom/callback-actions.h"
+#include "gmock/internal/custom/gmock-generated-actions.h"
 
 #endif  // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_