diff options
| author | Pete Warden <pete@petewarden.com> | 2016-03-09 13:05:15 -0800 |
|---|---|---|
| committer | Pete Warden <pete@petewarden.com> | 2016-03-09 13:05:15 -0800 |
| commit | bc2d6c2504b38dda4345e9960948d96102daccc3 (patch) | |
| tree | 48ad357a166b3bf9715a20714db8c117d8150c41 /Makefile.am | |
| parent | f0c1a8637218a03a083901493c9b3acdb6e5db57 (diff) | |
| parent | 48ebb29a8ec118bf6b9ee39f6be42b57321c099a (diff) | |
| download | protobuf-bc2d6c2504b38dda4345e9960948d96102daccc3.tar.gz protobuf-bc2d6c2504b38dda4345e9960948d96102daccc3.tar.bz2 protobuf-bc2d6c2504b38dda4345e9960948d96102daccc3.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index fbd27fc5..064efdfb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -413,6 +413,7 @@ objectivec_EXTRA_DIST= \ objectivec/GPBCodedInputStream_PackagePrivate.h \ objectivec/GPBCodedOutputStream.h \ objectivec/GPBCodedOutputStream.m \ + objectivec/GPBCodedOutputStream_PackagePrivate.h \ objectivec/GPBDescriptor.h \ objectivec/GPBDescriptor.m \ objectivec/GPBDescriptor_PackagePrivate.h \ @@ -653,7 +654,6 @@ ruby_EXTRA_DIST= \ ruby/tests/repeated_field_test.rb \ ruby/tests/stress.rb \ ruby/tests/generated_code.proto \ - ruby/tests/generated_code.rb \ ruby/tests/generated_code_test.rb \ ruby/travis-test.sh |