aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorPaul Yang <TeBoring@users.noreply.github.com>2017-08-30 16:50:07 -0700
committerGitHub <noreply@github.com>2017-08-30 16:50:07 -0700
commit2807436cd828a526c5c38dd235c0d0d9cdc67b1f (patch)
tree0306119c51ce52108e47caabd21bb86c9d247e35 /Makefile.am
parent21b23723315caf2925e840cac4d5e112034f26b5 (diff)
downloadprotobuf-2807436cd828a526c5c38dd235c0d0d9cdc67b1f.tar.gz
protobuf-2807436cd828a526c5c38dd235c0d0d9cdc67b1f.tar.bz2
protobuf-2807436cd828a526c5c38dd235c0d0d9cdc67b1f.zip
change the field number of php_generic_service to fix the conflict with (#3576)
internal descriptor.proto
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 323cc683..7831a09e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -619,6 +619,7 @@ php_EXTRA_DIST= \
php/src/Google/Protobuf/Internal/EnumOptions.php \
php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php \
php/src/Google/Protobuf/Internal/EnumValueOptions.php \
+ php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php \
php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php \
php/src/Google/Protobuf/Internal/FieldDescriptorProto.php \
php/src/Google/Protobuf/Internal/FieldDescriptor.php \