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/descriptor.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/descriptor.proto')
| -rw-r--r-- | src/google/protobuf/descriptor.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index 375814c9..7099135d 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -43,6 +43,7 @@ package google.protobuf; option java_package = "com.google.protobuf"; option java_outer_classname = "DescriptorProtos"; option csharp_namespace = "Google.ProtocolBuffers.DescriptorProtos"; +option objc_class_prefix = "GPB"; // descriptor.proto must be optimized for speed because reflection-based // algorithms don't work during bootstrapping. |