diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-05-13 13:35:02 -0700 |
| commit | 41113108303afbc1458c1c82b267cc17703ea8ce (patch) | |
| tree | 70ee5f7e6d383fbc5f125daf1b54e1e0766ab1b1 /src/google/protobuf/field_mask.proto | |
| parent | 3bc162a8ace489bc8a62c5e715f7bf673bd8db75 (diff) | |
| parent | 23bb79d4a32a77e8349d6c49052be1e56a8b8153 (diff) | |
Merge branch 'master' of github.com:google/protobuf into integrate_from_master
Diffstat (limited to 'src/google/protobuf/field_mask.proto')
| -rw-r--r-- | src/google/protobuf/field_mask.proto | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/field_mask.proto b/src/google/protobuf/field_mask.proto index 0b98411c..35b1acc3 100644 --- a/src/google/protobuf/field_mask.proto +++ b/src/google/protobuf/field_mask.proto @@ -35,6 +35,8 @@ option java_multiple_files = true; option java_outer_classname = "FieldMaskProto"; option java_package = "com.google.protobuf"; option csharp_namespace = "Google.ProtocolBuffers"; +option objc_class_prefix = "GPB"; + // `FieldMask` represents a set of symbolic field paths, for example: // |