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/field_mask.pb.cc | |
parent | f5a3abc20487e423a7b3b2e13ad630e2d5026895 (diff) | |
parent | dc80689af3951d078cb556588eece89dd6860c91 (diff) | |
download | protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.tar.gz protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.tar.bz2 protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/google/protobuf/field_mask.pb.cc')
-rw-r--r-- | src/google/protobuf/field_mask.pb.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 68314fd3..88020ef2 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -81,8 +81,9 @@ void protobuf_AddDesc_google_2fprotobuf_2ffield_5fmask_2eproto() { ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( "\n google/protobuf/field_mask.proto\022\017goog" "le.protobuf\"\032\n\tFieldMask\022\r\n\005paths\030\001 \003(\tB" - "F\n\023com.google.protobufB\016FieldMaskProtoP\001" - "\242\002\003GPB\252\002\026Google.ProtocolBuffersb\006proto3", 159); + "N\n\023com.google.protobufB\016FieldMaskProtoP\001" + "\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypesb" + "\006proto3", 167); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/field_mask.proto", &protobuf_RegisterTypes); FieldMask::default_instance_ = new FieldMask(); |