diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-12-10 20:56:13 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-10 20:56:13 -0800 |
| commit | 52909485d15a9ac617bc8948c02dafd1ab4233bd (patch) | |
| tree | b0d60d94523b828c077bfe47f30ce0e70c01f267 /Makefile.am | |
| parent | 261fe97a63316a4a4918afcaa6c8c0f4b0da45fc (diff) | |
| parent | 8d5d7cc6d03b00fcb7162525100fbd4cc0d1929d (diff) | |
Merge branch v3.0.0-alpha-1 into master.
Conflicts:
configure.ac
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 292b8725..dadccf25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,6 +135,7 @@ java_EXTRA_DIST= \ java/src/test/java/com/google/protobuf/field_presence_test.proto \ java/src/test/java/com/google/protobuf/lazy_fields_lite.proto \ java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto \ + java/src/test/java/com/google/protobuf/map_for_proto2_lite_test.proto \ java/src/test/java/com/google/protobuf/map_for_proto2_test.proto \ java/src/test/java/com/google/protobuf/map_test.proto \ java/src/test/java/com/google/protobuf/multiple_files_test.proto \ |