aboutsummaryrefslogtreecommitdiff
path: root/generate_descriptor_proto.sh
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2016-03-30 11:43:44 -0700
committerJisi Liu <jisi.liu@gmail.com>2016-03-30 11:43:44 -0700
commit0de06f54bc8253ba39eee9e8cc4c5de487a48835 (patch)
treee66dec08e23df554f5c29a1dbb4592388815e4ec /generate_descriptor_proto.sh
parent3b3c8abb9635eb3ea078a821a99c9ef29d66dff7 (diff)
parenta25e9964b126a79e8a99bced2207ddca22d6a1a9 (diff)
downloadprotobuf-0de06f54bc8253ba39eee9e8cc4c5de487a48835.tar.gz
protobuf-0de06f54bc8253ba39eee9e8cc4c5de487a48835.tar.bz2
protobuf-0de06f54bc8253ba39eee9e8cc4c5de487a48835.zip
Merge branch 'master' of github.com:google/protobuf
Diffstat (limited to 'generate_descriptor_proto.sh')
-rwxr-xr-xgenerate_descriptor_proto.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/generate_descriptor_proto.sh b/generate_descriptor_proto.sh
index 4fe64dda..c170c837 100755
--- a/generate_descriptor_proto.sh
+++ b/generate_descriptor_proto.sh
@@ -95,9 +95,9 @@ do
done
cd ..
-if test -x objectivec/generate_descriptors_proto.sh; then
+if test -x objectivec/generate_well_known_types.sh; then
echo "Generating messages for objc."
- objectivec/generate_descriptors_proto.sh $@
+ objectivec/generate_well_known_types.sh $@
fi
if test -x csharp/generate_protos.sh; then