diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 11:01:32 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 11:01:32 -0800 |
| commit | 643d09ac7dcbf3b014a8a0465ebc4405ac8388b7 (patch) | |
| tree | 67abff5f87181bf73ae4b7588028647d6126a7d7 /src/google/protobuf/compiler/java/java_helpers.h | |
| 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/compiler/java/java_helpers.h')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_helpers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/java/java_helpers.h b/src/google/protobuf/compiler/java/java_helpers.h index 2707fa0a..d957fdc4 100644 --- a/src/google/protobuf/compiler/java/java_helpers.h +++ b/src/google/protobuf/compiler/java/java_helpers.h @@ -132,7 +132,7 @@ string FieldConstantName(const FieldDescriptor *field); // Returns the type of the FieldDescriptor. // This does nothing interesting for the open source release, but is used for -// hacks that improve compatability with version 1 protocol buffers at Google. +// hacks that improve compatibility with version 1 protocol buffers at Google. FieldDescriptor::Type GetType(const FieldDescriptor* field); enum JavaType { |