diff options
author | Adam Cozzette <acozzette@gmail.com> | 2018-03-20 16:14:32 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-20 16:14:32 -0700 |
commit | ed4321d1cb33199984118d801956822842771e7e (patch) | |
tree | 16c54ef8d5409766c18ccae8fca685230680d620 /Makefile.am | |
parent | e436ee0aa179340832281b7d90885e9ff15b3748 (diff) | |
parent | 11d26ce24c90a6cf2544f71e09970513550ef6c6 (diff) | |
download | protobuf-ed4321d1cb33199984118d801956822842771e7e.tar.gz protobuf-ed4321d1cb33199984118d801956822842771e7e.tar.bz2 protobuf-ed4321d1cb33199984118d801956822842771e7e.zip |
Merge pull request #4387 from acozzette/down-integrate
Integrated internal changes from Google
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index d392429f..07119d63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -354,6 +354,7 @@ java_EXTRA_DIST= java/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto \ java/core/src/test/proto/com/google/protobuf/map_for_proto2_test.proto \ java/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto \ + java/core/src/test/proto/com/google/protobuf/map_lite_test.proto \ java/core/src/test/proto/com/google/protobuf/map_test.proto \ java/core/src/test/proto/com/google/protobuf/multiple_files_test.proto \ java/core/src/test/proto/com/google/protobuf/nested_builders_test.proto \ @@ -808,6 +809,7 @@ python_EXTRA_DIST= \ python/google/protobuf/internal/more_extensions.proto \ python/google/protobuf/internal/more_extensions_dynamic.proto \ python/google/protobuf/internal/more_messages.proto \ + python/google/protobuf/internal/no_package.proto \ python/google/protobuf/internal/packed_field_test.proto \ python/google/protobuf/internal/proto_builder_test.py \ python/google/protobuf/internal/python_message.py \ @@ -861,6 +863,7 @@ python_EXTRA_DIST= \ python/google/protobuf/pyext/repeated_scalar_container.h \ python/google/protobuf/pyext/safe_numerics.h \ python/google/protobuf/pyext/scoped_pyobject_ptr.h \ + python/google/protobuf/pyext/thread_unsafe_shared_ptr.h \ python/google/protobuf/reflection.py \ python/google/protobuf/service.py \ python/google/protobuf/service_reflection.py \ |