diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:18:45 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:18:45 -0700 |
commit | b0f661181d10bddc08e380992590a1cdd92be92b (patch) | |
tree | d9291cf324a72206ae3e474fe49186e8c96b2a9e /src/google/protobuf/field_mask.pb.cc | |
parent | d119a275495b7dcc9c389c9c650ebd83de265511 (diff) |
Down-integrate from internal branch.
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
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..8a6de0fa 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); + "I\n\023com.google.protobufB\016FieldMaskProtoP\001" + "\240\001\001\242\002\003GPB\252\002\026Google.ProtocolBuffersb\006prot" + "o3", 162); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/field_mask.proto", &protobuf_RegisterTypes); FieldMask::default_instance_ = new FieldMask(); |