aboutsummaryrefslogtreecommitdiff
path: root/Protobuf.podspec
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2016-03-29 16:24:35 -0700
committerJosh Haberman <jhaberman@gmail.com>2016-03-29 16:24:35 -0700
commita15b916c419000565384a78224e402ed925e5fc8 (patch)
treed0bd6aa4648fddbb08d35d8b78dba32958ae7b51 /Protobuf.podspec
parent67c727cd411a339eb4233c84d9a1afadd8c20566 (diff)
parent261ee021f640ea6fe67aaf1f53e1518ed154cad0 (diff)
downloadprotobuf-a15b916c419000565384a78224e402ed925e5fc8.tar.gz
protobuf-a15b916c419000565384a78224e402ed925e5fc8.tar.bz2
protobuf-a15b916c419000565384a78224e402ed925e5fc8.zip
Merge branch 'master' into docker
Diffstat (limited to 'Protobuf.podspec')
-rw-r--r--Protobuf.podspec1
1 files changed, 0 insertions, 1 deletions
diff --git a/Protobuf.podspec b/Protobuf.podspec
index 02c83723..0bbd06df 100644
--- a/Protobuf.podspec
+++ b/Protobuf.podspec
@@ -17,7 +17,6 @@ Pod::Spec.new do |s|
s.source_files = 'objectivec/*.{h,m}',
'objectivec/google/protobuf/Any.pbobjc.{h,m}',
'objectivec/google/protobuf/Api.pbobjc.{h,m}',
- 'objectivec/google/protobuf/Descriptor.pbobjc.{h,m}',
'objectivec/google/protobuf/Duration.pbobjc.h',
'objectivec/google/protobuf/Empty.pbobjc.{h,m}',
'objectivec/google/protobuf/FieldMask.pbobjc.{h,m}',