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/descriptor.cc | |
| 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/descriptor.cc')
| -rw-r--r-- | src/google/protobuf/descriptor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc index ab8691fd..06184820 100644 --- a/src/google/protobuf/descriptor.cc +++ b/src/google/protobuf/descriptor.cc @@ -3600,7 +3600,7 @@ const FileDescriptor* DescriptorBuilder::BuildFile( // Note: This only works if the input is canonical -- that is, it // fully-qualifies all type names, has no UninterpretedOptions, etc. // This is fine, because this idempotency "feature" really only exists to - // accomodate one hack in the proto1->proto2 migration layer. + // accommodate one hack in the proto1->proto2 migration layer. const FileDescriptor* existing_file = tables_->FindFile(filename_); if (existing_file != NULL) { // File already in pool. Compare the existing one to the input. |