diff options
| author | Jon Skeet <skeet@pobox.com> | 2015-06-17 15:03:47 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-06-17 15:03:47 +0100 |
| commit | e2acd854250b449a3fdeef2ad52402c4c5d78259 (patch) | |
| tree | a08126762b6c76d56fde8ce443f8dff36408b6e0 /src/google/protobuf/descriptor.proto | |
| parent | d9dc05e500807a6f0cd10d4637c599acc9a6aecf (diff) | |
| parent | b36395b2bac88f70070544c325bc09234cb1f1a6 (diff) | |
| download | protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.tar.gz protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.tar.bz2 protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.zip | |
Merged 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 97741b6a..82de7b09 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -40,6 +40,7 @@ syntax = "proto2"; package google.protobuf; +option go_package = "descriptor"; option java_package = "com.google.protobuf"; option java_outer_classname = "DescriptorProtos"; option csharp_namespace = "Google.Protobuf.DescriptorProtos"; |