Merge remote-tracking branch 'origin/master' into fix-author

bithium · Oct 5, 2015 · 831b819 · 831b819
2 parents e2836fc + 1e5c5df
commit 831b819
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/google/protobuf/descriptor.proto b/google/protobuf/descriptor.proto
@@ -43,8 +43,7 @@ package google.protobuf;
 option go_package = "descriptor";
 option java_package = "com.google.protobuf";
 option java_outer_classname = "DescriptorProtos";
-// Re-enable this once the tools have picked up the csharp_namespace option.
-// 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