aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-01-10 14:35:21 -0500
committerGitHub <noreply@github.com>2018-01-10 14:35:21 -0500
commitd7196896bb8346534ee0f52336d547fd861d6eb0 (patch)
tree521c645c6d76f7eaeff567f6de77cc01dd327432
parent6efe104aed8dccfdb6472cf894a1b51a8148784b (diff)
parent62dbaa2947f7d058ea7e16703faea69b1134b024 (diff)
downloadgoogletest-d7196896bb8346534ee0f52336d547fd861d6eb0.tar.gz
googletest-d7196896bb8346534ee0f52336d547fd861d6eb0.tar.bz2
googletest-d7196896bb8346534ee0f52336d547fd861d6eb0.zip
Merge pull request #1396 from gennadiycivil/master
small cleanup/,merge
-rw-r--r--googletest/include/gtest/internal/gtest-string.h4
-rw-r--r--googletest/test/production.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/googletest/include/gtest/internal/gtest-string.h b/googletest/include/gtest/internal/gtest-string.h
index 97f1a7fd..04b9e7b3 100644
--- a/googletest/include/gtest/internal/gtest-string.h
+++ b/googletest/include/gtest/internal/gtest-string.h
@@ -27,7 +27,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
-// Authors: wan@google.com (Zhanyong Wan), eefacm@gmail.com (Sean Mcafee)
//
// The Google C++ Testing Framework (Google Test)
//
@@ -35,7 +34,8 @@
// Google Test. They are subject to change without notice. They should not used
// by code external to Google Test.
//
-// This header file is #included by <gtest/internal/gtest-internal.h>.
+// This header file is #included by
+// gtest/internal/gtest-internal.h.
// It should not be #included by other files.
#ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_STRING_H_
diff --git a/googletest/test/production.cc b/googletest/test/production.cc
index 8b8a40b4..006bb970 100644
--- a/googletest/test/production.cc
+++ b/googletest/test/production.cc
@@ -29,7 +29,7 @@
//
// Author: wan@google.com (Zhanyong Wan)
//
-// This is part of the unit test for include/gtest/gtest_prod.h.
+// This is part of the unit test for gtest_prod.h.
#include "production.h"