summaryrefslogtreecommitdiffstats
path: root/googletest/src/gtest.cc
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-02-09 16:42:05 (GMT)
committerGitHub <noreply@github.com>2018-02-09 16:42:05 (GMT)
commitb324a36c35c1f3397e0a6d664114980f3f7ddff8 (patch)
tree6ff499e0888f6cc6b0bc89aea9f512123780706f /googletest/src/gtest.cc
parent092d0885332316ca679ac77e0f8fe1f5c368fb4f (diff)
parent22a115055a34443a01a3006bc2e0c1697c29abe1 (diff)
downloadgoogletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.zip
googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.tar.gz
googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.tar.bz2
Merge branch 'master' into assertrefs/pull/1439/head
Diffstat (limited to 'googletest/src/gtest.cc')
-rw-r--r--googletest/src/gtest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 54e25b2..ada5849 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -1718,7 +1718,7 @@ AssertionResult IsHRESULTFailure(const char* expr, long hr) { // NOLINT
// Utility functions for encoding Unicode text (wide strings) in
// UTF-8.
-// A Unicode code-point can have upto 21 bits, and is encoded in UTF-8
+// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8
// like this:
//
// Code-point length Encoding