diff options
| author | Jie Luo <anandolee@gmail.com> | 2015-05-14 14:54:36 -0700 |
|---|---|---|
| committer | Jie Luo <anandolee@gmail.com> | 2015-05-14 14:54:36 -0700 |
| commit | aa8c951ef58dbc6a5c1ec8118980938f20916ce8 (patch) | |
| tree | 07075ec40b4ebb013bd2f12c82d2f7f0c47b7b1b /src/google/protobuf/unittest_import.proto | |
| parent | b481a4f920d2f5872bc1e9bfd6b0656f6ad0b713 (diff) | |
| parent | 2d9b1c592ff7319ee9d6520c9df4838087522e05 (diff) | |
| download | protobuf-aa8c951ef58dbc6a5c1ec8118980938f20916ce8.tar.gz protobuf-aa8c951ef58dbc6a5c1ec8118980938f20916ce8.tar.bz2 protobuf-aa8c951ef58dbc6a5c1ec8118980938f20916ce8.zip | |
Merge pull request #384 from google/csharp
Merge protobuf C# into master (only C# proto2 is supported)
Diffstat (limited to 'src/google/protobuf/unittest_import.proto')
| -rw-r--r-- | src/google/protobuf/unittest_import.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/unittest_import.proto b/src/google/protobuf/unittest_import.proto index 7e165220..ae2e90b8 100644 --- a/src/google/protobuf/unittest_import.proto +++ b/src/google/protobuf/unittest_import.proto @@ -47,6 +47,7 @@ option cc_enable_arenas = true; // Exercise the java_package option. option java_package = "com.google.protobuf.test"; +option csharp_namespace = "Google.ProtocolBuffers.TestProtos"; // Do not set a java_outer_classname here to verify that Proto2 works without // one. |