diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-10-25 14:43:07 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-10-25 14:43:07 -0700 |
| commit | cdc0d9536a5c68510fde1e4c7d37fff18ecd0d6b (patch) | |
| tree | 1edd0bd0c5876d5fd9ddb52f342835e564792dc2 /Makefile.am | |
| parent | ee8a0911cbaca2a1849a847bbdc523120d003a31 (diff) | |
| parent | cefa9d73e3ce62b080fda0b306bbeb67a6fc2efa (diff) | |
| download | protobuf-cdc0d9536a5c68510fde1e4c7d37fff18ecd0d6b.tar.gz protobuf-cdc0d9536a5c68510fde1e4c7d37fff18ecd0d6b.tar.bz2 protobuf-cdc0d9536a5c68510fde1e4c7d37fff18ecd0d6b.zip | |
Merge remote-tracking branch 'origin/3.4.x' into master
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index aaf9e7d4..cd1cfc3e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -333,6 +333,7 @@ java_EXTRA_DIST= java/core/src/test/java/com/google/protobuf/WellKnownTypesTest.java \ java/core/src/test/java/com/google/protobuf/WireFormatTest.java \ java/core/src/test/proto/com/google/protobuf/any_test.proto \ + java/core/src/test/proto/com/google/protobuf/deprecated_file.proto \ java/core/src/test/proto/com/google/protobuf/field_presence_test.proto \ java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto \ java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto \ |