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/descriptor.proto | |
| parent | f5a3abc20487e423a7b3b2e13ad630e2d5026895 (diff) | |
| parent | dc80689af3951d078cb556588eece89dd6860c91 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/google/protobuf/descriptor.proto')
| -rw-r--r-- | src/google/protobuf/descriptor.proto | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index b70b385b..9d3dd8fb 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -44,7 +44,7 @@ option go_package = "descriptor"; option java_package = "com.google.protobuf"; option javanano_use_deprecated_package = true; option java_outer_classname = "DescriptorProtos"; -option csharp_namespace = "Google.ProtocolBuffers.DescriptorProtos"; +option csharp_namespace = "Google.Protobuf.Reflection"; option objc_class_prefix = "GPB"; // descriptor.proto must be optimized for speed because reflection-based |