diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-03-29 16:24:35 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-29 16:24:35 -0700 |
| commit | a15b916c419000565384a78224e402ed925e5fc8 (patch) | |
| tree | d0bd6aa4648fddbb08d35d8b78dba32958ae7b51 /generate_descriptor_proto.sh | |
| parent | 67c727cd411a339eb4233c84d9a1afadd8c20566 (diff) | |
| parent | 261ee021f640ea6fe67aaf1f53e1518ed154cad0 (diff) | |
| download | protobuf-a15b916c419000565384a78224e402ed925e5fc8.tar.gz protobuf-a15b916c419000565384a78224e402ed925e5fc8.tar.bz2 protobuf-a15b916c419000565384a78224e402ed925e5fc8.zip | |
Merge branch 'master' into docker
Diffstat (limited to 'generate_descriptor_proto.sh')
| -rwxr-xr-x | generate_descriptor_proto.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generate_descriptor_proto.sh b/generate_descriptor_proto.sh index 81b8a0d6..1690d0da 100755 --- a/generate_descriptor_proto.sh +++ b/generate_descriptor_proto.sh @@ -92,9 +92,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 |