diff options
author | Jisi Liu <liujisi@google.com> | 2016-09-15 14:37:38 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-15 14:37:38 -0700 |
commit | 9c4be5f654d8e7635a00dc3d65688d3203c99bb1 (patch) | |
tree | dbf22050be56619ea3f25d7c61f41cdd497e8db6 /src/Makefile.am | |
parent | b4235ac79c0d3e932f2fb24d2dc8b81fbc0de45a (diff) | |
parent | 58860c021f0bdd0c79e612e7092c6c3d692488c0 (diff) | |
download | protobuf-9c4be5f654d8e7635a00dc3d65688d3203c99bb1.tar.gz protobuf-9c4be5f654d8e7635a00dc3d65688d3203c99bb1.tar.bz2 protobuf-9c4be5f654d8e7635a00dc3d65688d3203c99bb1.zip |
Merge pull request #2112 from pherl/merge
Merge 3.0.x into master
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 13952e5b..c8b85447 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -552,6 +552,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 \ |