diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:42:27 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:44:49 -0700 |
| commit | c3bc155aceda36ecb01cde2367a3b427f2d7ce40 (patch) | |
| tree | 195d74745dad40a57d49bf718f50c7751336a405 /src/google/protobuf/field_mask.pb.cc | |
| parent | b0f661181d10bddc08e380992590a1cdd92be92b (diff) | |
| parent | eb65c69e14fb711208ad5111cb9672f00864bb6d (diff) | |
Merge branch 'master' of github.com:google/protobuf
Change-Id: If3fb07754a734bae610d95124528e073515ac525
Diffstat (limited to 'src/google/protobuf/field_mask.pb.cc')
| -rw-r--r-- | src/google/protobuf/field_mask.pb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/field_mask.pb.cc b/src/google/protobuf/field_mask.pb.cc index 8a6de0fa..0537057d 100644 --- a/src/google/protobuf/field_mask.pb.cc +++ b/src/google/protobuf/field_mask.pb.cc @@ -81,9 +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" - "I\n\023com.google.protobufB\016FieldMaskProtoP\001" - "\240\001\001\242\002\003GPB\252\002\026Google.ProtocolBuffersb\006prot" - "o3", 162); + "Q\n\023com.google.protobufB\016FieldMaskProtoP\001" + "\240\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTyp" + "esb\006proto3", 170); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/field_mask.proto", &protobuf_RegisterTypes); FieldMask::default_instance_ = new FieldMask(); |