diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2016-12-12 12:26:58 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-12 12:26:58 -0800 |
commit | 29fb87e1d554a739e47b647a7e8a1a20be8851c9 (patch) | |
tree | cd28c64900fe93e13e7a75e6ea2321d11c6f1280 /csharp | |
parent | 277a8b65805aceeefc1764947616430994e05bdf (diff) | |
parent | bb77cbf05a3453b6e96829558c679a47d075912f (diff) | |
download | protobuf-29fb87e1d554a739e47b647a7e8a1a20be8851c9.tar.gz protobuf-29fb87e1d554a739e47b647a7e8a1a20be8851c9.tar.bz2 protobuf-29fb87e1d554a739e47b647a7e8a1a20be8851c9.zip |
Merge pull request #2454 from pongad/go_package
update descriptor.proto's go_package
Diffstat (limited to 'csharp')
-rw-r--r-- | csharp/src/Google.Protobuf/Reflection/Descriptor.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs index decc0b06..52f97b96 100644 --- a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs +++ b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs @@ -142,9 +142,10 @@ namespace Google.Protobuf.Reflection { "CmFubm90YXRpb24YASADKAsyLS5nb29nbGUucHJvdG9idWYuR2VuZXJhdGVk", "Q29kZUluZm8uQW5ub3RhdGlvbhpPCgpBbm5vdGF0aW9uEhAKBHBhdGgYASAD", "KAVCAhABEhMKC3NvdXJjZV9maWxlGAIgASgJEg0KBWJlZ2luGAMgASgFEgsK", - "A2VuZBgEIAEoBUJYChNjb20uZ29vZ2xlLnByb3RvYnVmQhBEZXNjcmlwdG9y", - "UHJvdG9zSAFaCmRlc2NyaXB0b3KiAgNHUEKqAhpHb29nbGUuUHJvdG9idWYu", - "UmVmbGVjdGlvbg==")); + "A2VuZBgEIAEoBUKMAQoTY29tLmdvb2dsZS5wcm90b2J1ZkIQRGVzY3JpcHRv", + "clByb3Rvc0gBWj5naXRodWIuY29tL2dvbGFuZy9wcm90b2J1Zi9wcm90b2Mt", + "Z2VuLWdvL2Rlc2NyaXB0b3I7ZGVzY3JpcHRvcqICA0dQQqoCGkdvb2dsZS5Q", + "cm90b2J1Zi5SZWZsZWN0aW9u")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { |