diff options
| author |  Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
| commit | 2d9b1c592ff7319ee9d6520c9df4838087522e05 (patch) | |
| tree | 6eec7e633840b5b60cc85e20f6365df0702e6911 /csharp | |
| parent | 8a888922a9ac181a3fb47d00d497cde85ec4987a (diff) | |
| parent | 38da6583b1416a7c1594bffec3cdbb8856a72353 (diff) | |
Merge pull request #382 from jtattermusch/integrate_from_master
Integrate changes from latest master branch into csharp branch.
Diffstat (limited to 'csharp')
| -rw-r--r-- | csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs index 3939c9a4..02af2f50 100644 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs +++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs @@ -40,8 +40,8 @@ namespace Google.ProtocolBuffers.TestProtos { "X3ZhbHVlGAIgASgOMjsudW5pdHRlc3RfZHJvcF91bmtub3duX2ZpZWxkcy5G", "b29XaXRoRXh0cmFGaWVsZHMuTmVzdGVkRW51bRIZChFleHRyYV9pbnQzMl92", "YWx1ZRgDIAEoBSIwCgpOZXN0ZWRFbnVtEgcKA0ZPTxAAEgcKA0JBUhABEgcK", - "A0JBWhACEgcKA1FVWBADQiSqAiFHb29nbGUuUHJvdG9jb2xCdWZmZXJzLlRl", - "c3RQcm90b3NiBnByb3RvMw==")); + "A0JBWhACEgcKA1FVWBADQjOiAgxEcm9wVW5rbm93bnOqAiFHb29nbGUuUHJv", + "dG9jb2xCdWZmZXJzLlRlc3RQcm90b3NiBnByb3RvMw==")); pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { descriptor = root; internal__static_unittest_drop_unknown_fields_Foo__Descriptor = Descriptor.MessageTypes[0]; |