diff options
| author | Jisi Liu <liujisi@google.com> | 2017-08-07 11:47:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-07 11:47:29 -0700 |
| commit | 3afcded28a6aa9c44adf801ca5bff2133fcf3030 (patch) | |
| tree | cebd73fdf090a98c32ad1a1c996af9cc8f1f8ad6 /csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs | |
| parent | 176713d6fbbf72056b009f76e7625f267273bd75 (diff) | |
| parent | 8f4b8e430a0cf087af423be434cf8d837027c651 (diff) | |
| download | protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.tar.gz protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.tar.bz2 protobuf-3afcded28a6aa9c44adf801ca5bff2133fcf3030.zip | |
Merge pull request #3461 from TeBoring/3.4.xv3.4.0rc1
Merge master into 3.4.x
Diffstat (limited to 'csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs')
| -rw-r--r-- | csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs b/csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs index 076afb3b..6607be7a 100644 --- a/csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs +++ b/csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs @@ -198,9 +198,9 @@ namespace ProtobufTestMessages.Proto3 { "AjgBIjkKCk5lc3RlZEVudW0SBwoDRk9PEAASBwoDQkFSEAESBwoDQkFaEAIS", "EAoDTkVHEP///////////wFCDQoLb25lb2ZfZmllbGQiGwoORm9yZWlnbk1l", "c3NhZ2USCQoBYxgBIAEoBSpACgtGb3JlaWduRW51bRIPCgtGT1JFSUdOX0ZP", - "TxAAEg8KC0ZPUkVJR05fQkFSEAESDwoLRk9SRUlHTl9CQVoQAkIvCihjb20u", - "Z29vZ2xlLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8zSAH4AQFiBnBy", - "b3RvMw==")); + "TxAAEg8KC0ZPUkVJR05fQkFSEAESDwoLRk9SRUlHTl9CQVoQAkI4Cihjb20u", + "Z29vZ2xlLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8zSAH4AQGiAgZQ", + "cm90bzNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.AnyReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.DurationReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.FieldMaskReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.StructReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ProtobufTestMessages.Proto3.ForeignEnum), }, new pbr::GeneratedClrTypeInfo[] { |