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.Conformance/Conformance.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.Conformance/Conformance.cs')
-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 { |