aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/descriptor.proto
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2015-04-17 11:07:02 -0700
committerGravatar Jan Tattermusch <jtattermusch@google.com>2015-04-17 11:07:02 -0700
commit8e190d498c9e402c787e70cde4afc7124393bea6 (patch)
treee228faca7cde729ae4be9fc25afedb79197e1cc0 /src/google/protobuf/descriptor.proto
parent83a5991d12ecabc3388c99d121892a488ea8ee97 (diff)
temporarily removing csharp_umbrella_namespace file option
Diffstat (limited to 'src/google/protobuf/descriptor.proto')
-rw-r--r--src/google/protobuf/descriptor.proto7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto
index 912e4301..a4b64f65 100644
--- a/src/google/protobuf/descriptor.proto
+++ b/src/google/protobuf/descriptor.proto
@@ -354,13 +354,6 @@ message FileOptions {
// Namespace for generated classes; defaults to the package.
optional string csharp_namespace = 37;
- // A nested namespace for the umbrella class, which contains metadata about
- // all the messages within the file. This option is helpful for name
- // collisions between the umbrella class and an existing type. This will be
- // automatically set to 'Proto' if a collision is detected with types being
- // generated.
- optional string csharp_umbrella_namespace = 38;
-
// The parser stores options it doesn't recognize here. See above.
repeated UninterpretedOption uninterpreted_option = 999;