diff options
author | Jon Skeet <skeet@pobox.com> | 2012-06-04 10:43:06 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2012-06-04 10:43:06 +0100 |
commit | 57e5746a398e0f61a9170ee053a93ad4a001581c (patch) | |
tree | f995ba17dc1433da2ec5eb9c23f32d88c688e4b8 /protos | |
parent | 1c78914320b0e45d7b7b2b189b366885f7c9b881 (diff) | |
parent | 34378b49b5b7a2cac2305cd32a041b3ec29c66f8 (diff) | |
download | protobuf-57e5746a398e0f61a9170ee053a93ad4a001581c.tar.gz protobuf-57e5746a398e0f61a9170ee053a93ad4a001581c.tar.bz2 protobuf-57e5746a398e0f61a9170ee053a93ad4a001581c.zip |
Merge.
Diffstat (limited to 'protos')
-rw-r--r-- | protos/extest/unittest_issues.proto | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/protos/extest/unittest_issues.proto b/protos/extest/unittest_issues.proto index 5e0da0ae..cb803791 100644 --- a/protos/extest/unittest_issues.proto +++ b/protos/extest/unittest_issues.proto @@ -129,4 +129,9 @@ message DeprecatedFieldsMessage { optional DeprecatedEnum EnumValue = 5 [deprecated = true];
repeated DeprecatedEnum EnumArray = 6 [deprecated = true];
-}
\ No newline at end of file +}
+
+// Issue 45: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=45
+message ItemField {
+ optional int32 item = 1;
+}
|