diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2016-09-14 09:37:48 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2016-09-14 09:37:48 -0700 |
commit | 58860c021f0bdd0c79e612e7092c6c3d692488c0 (patch) | |
tree | 7c05b76a3b5573130daf2d0bf4e70359d87f02c1 /src/Makefile.am | |
parent | 86fcd879b38505446799b2f2a2929415ddad620a (diff) | |
parent | 57170b93438b25c9c7da9bc53a9545dad261fbcb (diff) | |
download | protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.tar.gz protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.tar.bz2 protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.zip |
Merge remote-tracking branch 'origin/3.0.x' into merge
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f70e9550..1964a541 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -550,6 +550,7 @@ EXTRA_DIST = \ google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt \ google/protobuf/package_info.h \ google/protobuf/io/package_info.h \ + google/protobuf/util/package_info.h \ google/protobuf/compiler/ruby/ruby_generated_code.proto \ google/protobuf/compiler/ruby/ruby_generated_code_pb.rb \ google/protobuf/compiler/package_info.h \ |