diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:42:27 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:44:49 -0700 |
commit | c3bc155aceda36ecb01cde2367a3b427f2d7ce40 (patch) | |
tree | 195d74745dad40a57d49bf718f50c7751336a405 /src/google/protobuf/type.proto | |
parent | b0f661181d10bddc08e380992590a1cdd92be92b (diff) | |
parent | eb65c69e14fb711208ad5111cb9672f00864bb6d (diff) | |
download | protobuf-c3bc155aceda36ecb01cde2367a3b427f2d7ce40.tar.gz protobuf-c3bc155aceda36ecb01cde2367a3b427f2d7ce40.tar.bz2 protobuf-c3bc155aceda36ecb01cde2367a3b427f2d7ce40.zip |
Merge branch 'master' of github.com:google/protobuf
Change-Id: If3fb07754a734bae610d95124528e073515ac525
Diffstat (limited to 'src/google/protobuf/type.proto')
-rw-r--r-- | src/google/protobuf/type.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/type.proto b/src/google/protobuf/type.proto index d6b01825..4df95762 100644 --- a/src/google/protobuf/type.proto +++ b/src/google/protobuf/type.proto @@ -38,6 +38,7 @@ option java_package = "com.google.protobuf"; option java_outer_classname = "TypeProto"; option java_multiple_files = true; option java_generate_equals_and_hash = true; +option csharp_namespace = "Google.Protobuf.WellKnownTypes"; option objc_class_prefix = "GPB"; // A light-weight descriptor for a proto message type. |