diff options
| author | Jon Skeet <skeet@pobox.com> | 2008-10-23 21:05:58 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2008-10-23 21:05:58 +0100 |
| commit | 20bfd9bf5015b21adab17fce4bd78510f25137d9 (patch) | |
| tree | 7ef5e47fd4e5c579b7daa8496fe9da465228302a /protos | |
| parent | b8c2fc57fc4711293e487c6a8df95de5188f9c28 (diff) | |
| download | protobuf-20bfd9bf5015b21adab17fce4bd78510f25137d9.tar.gz protobuf-20bfd9bf5015b21adab17fce4bd78510f25137d9.tar.bz2 protobuf-20bfd9bf5015b21adab17fce4bd78510f25137d9.zip | |
Fix bug in GeneratedBuilder.MergeFrom
Diffstat (limited to 'protos')
| -rw-r--r-- | protos/google/protobuf/unittest_optimize_for.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/protos/google/protobuf/unittest_optimize_for.proto b/protos/google/protobuf/unittest_optimize_for.proto index 390b37b2..8e4ec113 100644 --- a/protos/google/protobuf/unittest_optimize_for.proto +++ b/protos/google/protobuf/unittest_optimize_for.proto @@ -55,6 +55,7 @@ message TestOptimizedForSize { extend TestOptimizedForSize { optional int32 test_extension = 1234; + optional TestRequiredOptimizedForSize test_extension2 = 1235; } } |