diff options
| author |  Xiao Hang <rocking@google.com> | 2015-08-04 15:07:44 -0700 |
|---|---|---|
| committer | Xiao Hang <rocking@google.com> | 2015-08-04 15:07:44 -0700 |
| commit | 9fd0f1526fab9ee9b7e9d021185bc3507048a6d2 (patch) | |
| tree | a10acdb4210cf4d7dc770db88efc694aa35ec1de /src/google/protobuf/descriptor.pb.cc | |
| parent | f5a3abc20487e423a7b3b2e13ad630e2d5026895 (diff) | |
| parent | dc80689af3951d078cb556588eece89dd6860c91 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/google/protobuf/descriptor.pb.cc')
| -rw-r--r-- | src/google/protobuf/descriptor.pb.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc index d2070bc4..5e7eeaa7 100644 --- a/src/google/protobuf/descriptor.pb.cc +++ b/src/google/protobuf/descriptor.pb.cc @@ -755,10 +755,9 @@ void protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto() { "tion\032\206\001\n\010Location\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004s" "pan\030\002 \003(\005B\002\020\001\022\030\n\020leading_comments\030\003 \001(\t\022" "\031\n\021trailing_comments\030\004 \001(\t\022!\n\031leading_de" - "tached_comments\030\006 \003(\tBh\n\023com.google.prot" + "tached_comments\030\006 \003(\tB[\n\023com.google.prot" "obufB\020DescriptorProtosH\001Z\ndescriptor\242\002\003G" - "PB\252\002\'Google.ProtocolBuffers.DescriptorPr" - "otos\260\002\001", 5007); + "PB\252\002\032Google.Protobuf.Reflection\260\002\001", 4994); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/descriptor.proto", &protobuf_RegisterTypes); FileDescriptorSet::default_instance_ = new FileDescriptorSet(); |