aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/empty.proto
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2016-04-01 17:22:58 -0700
committerJisi Liu <liujisi@google.com>2016-04-01 17:22:58 -0700
commitaeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5 (patch)
treef7ce45e0922c46eecd01a36afb6d8ec5a71c8155 /src/google/protobuf/empty.proto
parent452e2b2c5c607ab5d63cd813793f1aa960f19d1c (diff)
parent7630a83767dcee42d12bac68021f53aeb3d288f8 (diff)
downloadprotobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.tar.gz
protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.tar.bz2
protobuf-aeacf51602f78c206ea3e8b103e0a7a3c3a5d8c5.zip
Merge pull request #1381 from pherl/internal-merge
Merge Google internal changes to an internal branch
Diffstat (limited to 'src/google/protobuf/empty.proto')
-rw-r--r--src/google/protobuf/empty.proto1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/empty.proto b/src/google/protobuf/empty.proto
index b96daf28..37f4cd10 100644
--- a/src/google/protobuf/empty.proto
+++ b/src/google/protobuf/empty.proto
@@ -33,6 +33,7 @@ syntax = "proto3";
package google.protobuf;
option csharp_namespace = "Google.Protobuf.WellKnownTypes";
+option go_package = "github.com/golang/protobuf/ptypes/empty";
option java_package = "com.google.protobuf";
option java_outer_classname = "EmptyProto";
option java_multiple_files = true;