diff options
author | 2014-11-11 11:01:32 -0800 | |
---|---|---|
committer | 2014-11-11 11:01:32 -0800 | |
commit | 643d09ac7dcbf3b014a8a0465ebc4405ac8388b7 (patch) | |
tree | 67abff5f87181bf73ae4b7588028647d6126a7d7 /src/google/protobuf/io | |
parent | 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e (diff) | |
parent | c76807211af6ae86368bcd7651ca707ee7f12f86 (diff) |
Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo
Conflicts:
src/google/protobuf/compiler/java/java_file.cc
Diffstat (limited to 'src/google/protobuf/io')
-rw-r--r-- | src/google/protobuf/io/tokenizer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/io/tokenizer.h b/src/google/protobuf/io/tokenizer.h index 8c6220a1..98576f56 100644 --- a/src/google/protobuf/io/tokenizer.h +++ b/src/google/protobuf/io/tokenizer.h @@ -350,7 +350,7 @@ class LIBPROTOBUF_EXPORT Tokenizer { // ----------------------------------------------------------------- // These helper methods make the parsing code more readable. The - // "character classes" refered to are defined at the top of the .cc file. + // "character classes" referred to are defined at the top of the .cc file. // Basically it is a C++ class with one method: // static bool InClass(char c); // The method returns true if c is a member of this "class", like "Letter" |