From bb77cbf05a3453b6e96829558c679a47d075912f Mon Sep 17 00:00:00 2001
From: Michael Darakananda <pongad@google.com>
Date: Wed, 7 Dec 2016 18:15:17 +1100
Subject: update descriptor.proto's go_package

This change has already been made in google's repo.
Replicating the change here to unblock work on genproto.
---
 src/google/protobuf/descriptor.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/google/protobuf/descriptor.proto')

diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto
index eae31601..03aba076 100644
--- a/src/google/protobuf/descriptor.proto
+++ b/src/google/protobuf/descriptor.proto
@@ -40,7 +40,7 @@
 syntax = "proto2";
 
 package google.protobuf;
-option go_package = "descriptor";
+option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
 option java_package = "com.google.protobuf";
 option java_outer_classname = "DescriptorProtos";
 option csharp_namespace = "Google.Protobuf.Reflection";
-- 
cgit v1.2.3