diff options
| author | Jie Luo <anandolee@gmail.com> | 2015-05-13 10:58:58 -0700 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2015-05-13 10:58:58 -0700 |
| commit | 3bc162a8ace489bc8a62c5e715f7bf673bd8db75 (patch) | |
| tree | 29f15bb492cba1ebf07dc5d64fafcf3bd4f31fbc /src | |
| parent | 98de125a7caaf25c83e7d4988ed7f69587925aa8 (diff) | |
| parent | fd1693a3fb96c0a540fd700548b3e072eff41bca (diff) | |
| download | protobuf-3bc162a8ace489bc8a62c5e715f7bf673bd8db75.tar.gz protobuf-3bc162a8ace489bc8a62c5e715f7bf673bd8db75.tar.bz2 protobuf-3bc162a8ace489bc8a62c5e715f7bf673bd8db75.zip | |
Merge pull request #379 from jskeet/csharp
Remove the C#-specific field_presence_test.proto, using unittest_no_field_presence.proto instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/unittest_no_field_presence.proto | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/unittest_no_field_presence.proto b/src/google/protobuf/unittest_no_field_presence.proto index 6e71517c..f261b58e 100644 --- a/src/google/protobuf/unittest_no_field_presence.proto +++ b/src/google/protobuf/unittest_no_field_presence.proto @@ -37,7 +37,7 @@ import "google/protobuf/unittest.proto"; package proto2_nofieldpresence_unittest; -option csharp_namespace = "Google.ProtocolBuffers.TestProtos"; +option csharp_namespace = "Google.ProtocolBuffers.TestProtos.Proto3"; // This proto includes every type of field in both singular and repeated // forms. |