diff options
| author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-07-30 14:51:11 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-07-30 14:51:11 -0700 |
| commit | 12febd0a7611858eb026fab7eaf8a4d14c4eba80 (patch) | |
| tree | 1b56d97d4562c42135c0ed367d7836280e848366 /src/google/protobuf/struct.pb.cc | |
| parent | c6dffbcb4f77d7873847a5e853e79f0ddfc3ef2a (diff) | |
| parent | bde01d532610543072de3fd9f5d40823e1f1d53f (diff) | |
| download | protobuf-12febd0a7611858eb026fab7eaf8a4d14c4eba80.tar.gz protobuf-12febd0a7611858eb026fab7eaf8a4d14c4eba80.tar.bz2 protobuf-12febd0a7611858eb026fab7eaf8a4d14c4eba80.zip | |
Merge pull request #632 from google/csharp-experimental
Merge C# proto3 from csharp-experimental to master
Diffstat (limited to 'src/google/protobuf/struct.pb.cc')
| -rw-r--r-- | src/google/protobuf/struct.pb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/struct.pb.cc b/src/google/protobuf/struct.pb.cc index 30113cdb..1105ae5c 100644 --- a/src/google/protobuf/struct.pb.cc +++ b/src/google/protobuf/struct.pb.cc @@ -165,9 +165,9 @@ void protobuf_AddDesc_google_2fprotobuf_2fstruct_2eproto() { "\000\0220\n\nlist_value\030\006 \001(\0132\032.google.protobuf." "ListValueH\000B\006\n\004kind\"3\n\tListValue\022&\n\006valu" "es\030\001 \003(\0132\026.google.protobuf.Value*\033\n\tNull" - "Value\022\016\n\nNULL_VALUE\020\000BF\n\023com.google.prot" - "obufB\013StructProtoP\001\240\001\001\242\002\003GPB\252\002\026Google.Pr" - "otocolBuffersb\006proto3", 581); + "Value\022\016\n\nNULL_VALUE\020\000B\?\n\023com.google.prot" + "obufB\013StructProtoP\001\240\001\001\242\002\003GPB\252\002\017Google.Pr" + "otobufb\006proto3", 574); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/struct.proto", &protobuf_RegisterTypes); Struct::default_instance_ = new Struct(); |