diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
| commit | 41113108303afbc1458c1c82b267cc17703ea8ce (patch) | |
| tree | 70ee5f7e6d383fbc5f125daf1b54e1e0766ab1b1 /src/google/protobuf/descriptor.pb.cc | |
| parent | 3bc162a8ace489bc8a62c5e715f7bf673bd8db75 (diff) | |
| parent | 23bb79d4a32a77e8349d6c49052be1e56a8b8153 (diff) | |
Merge branch 'master' of github.com:google/protobuf into integrate_from_master
Diffstat (limited to 'src/google/protobuf/descriptor.pb.cc')
| -rw-r--r-- | src/google/protobuf/descriptor.pb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index d7100370..5ae36510 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -719,9 +719,9 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() { "path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020lead" "ing_comments\030\003 \001(\t\022\031\n\021trailing_comments\030" "\004 \001(\t\022!\n\031leading_detached_comments\030\006 \003(\t" - "BS\n\023com.google.protobufB\020DescriptorProto" - "sH\001\252\002\'Google.ProtocolBuffers.DescriptorP" - "rotos", 4685); + "BY\n\023com.google.protobufB\020DescriptorProto" + "sH\001\242\002\003GPB\252\002\'Google.ProtocolBuffers.Descr" + "iptorProtos", 4691); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/descriptor.proto", &protobuf_RegisterTypes); FileDescriptorSet::default_instance_ = new FileDescriptorSet(); |