diff options
| author | Jan Tattermusch <jtattermusch@google.com> | 2015-07-15 20:33:59 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-07-15 20:33:59 -0700 |
| commit | 11002e70c607255cf91fea0f998fe945ca6ddc5e (patch) | |
| tree | eadc17fc1043b12cccdd5868e775bc540faa9841 /objectivec | |
| parent | 385baaa87c52abf5339b0be7dccf8a4131667117 (diff) | |
| parent | fde6e89f99eda04a4f1b8677bcea07e6c2040405 (diff) | |
| download | protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.tar.gz protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.tar.bz2 protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.zip | |
Merge remote-tracking branch 'upstream/master' into csharp-experimental
Diffstat (limited to 'objectivec')
| -rw-r--r-- | objectivec/GPBProtocolBuffers.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/objectivec/GPBProtocolBuffers.h b/objectivec/GPBProtocolBuffers.h index a66f295e..0c85259e 100644 --- a/objectivec/GPBProtocolBuffers.h +++ b/objectivec/GPBProtocolBuffers.h @@ -42,3 +42,15 @@ #import "GPBUnknownFieldSet.h" #import "GPBUtilities.h" #import "GPBWireFormat.h" + +// Well-known proto types +#import "google/protobuf/Any.pbobjc.h" +#import "google/protobuf/Api.pbobjc.h" +#import "google/protobuf/Duration.pbobjc.h" +#import "google/protobuf/Empty.pbobjc.h" +#import "google/protobuf/FieldMask.pbobjc.h" +#import "google/protobuf/SourceContext.pbobjc.h" +#import "google/protobuf/Struct.pbobjc.h" +#import "google/protobuf/Timestamp.pbobjc.h" +#import "google/protobuf/Type.pbobjc.h" +#import "google/protobuf/Wrappers.pbobjc.h" |