diff options
| author | Bo Yang <paulyang1211@gmail.com> | 2017-08-05 10:42:29 -0700 |
|---|---|---|
| committer | Bo Yang <paulyang1211@gmail.com> | 2017-08-05 10:42:29 -0700 |
| commit | 8f4b8e430a0cf087af423be434cf8d837027c651 (patch) | |
| tree | a7a79a2ff33b31b9036eb378eb458928a0648481 /csharp/src/Google.Protobuf.Conformance | |
| parent | c2f69d6fa23a815948368fae0b8c1e56e50715c9 (diff) | |
| parent | f14703c933d04a4aac285c482bf828269bd0a151 (diff) | |
| download | protobuf-8f4b8e430a0cf087af423be434cf8d837027c651.tar.gz protobuf-8f4b8e430a0cf087af423be434cf8d837027c651.tar.bz2 protobuf-8f4b8e430a0cf087af423be434cf8d837027c651.zip | |
Merge branch 'master' into 3.4.x
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance')
| -rw-r--r-- | csharp/src/Google.Protobuf.Conformance/Conformance.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/csharp/src/Google.Protobuf.Conformance/Conformance.cs b/csharp/src/Google.Protobuf.Conformance/Conformance.cs index e1fbb350..394607b9 100644 --- a/csharp/src/Google.Protobuf.Conformance/Conformance.cs +++ b/csharp/src/Google.Protobuf.Conformance/Conformance.cs @@ -142,7 +142,9 @@ namespace Conformance { public const int MessageTypeFieldNumber = 4; private string messageType_ = ""; /// <summary> - /// should be set to either "proto2" or "proto3" + /// The full name for the test message to use; for the moment, either: + /// protobuf_test_messages.proto3.TestAllTypesProto3 or + /// protobuf_test_messages.proto2.TestAllTypesProto2. /// </summary> [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string MessageType { |