diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2016-11-23 11:26:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 11:26:31 -0800 |
| commit | 39f9b43219bc5718b659ed72a2130a7b2ce66108 (patch) | |
| tree | e48fe16afc2e1d868408e9453fff521d6ddcd4ae /Makefile.am | |
| parent | c9504715634948c9f8f306330449f296d926b74e (diff) | |
| parent | 65479cb7b1f99ab957da68abce17feb68a9e1cf0 (diff) | |
| download | protobuf-39f9b43219bc5718b659ed72a2130a7b2ce66108.tar.gz protobuf-39f9b43219bc5718b659ed72a2130a7b2ce66108.tar.bz2 protobuf-39f9b43219bc5718b659ed72a2130a7b2ce66108.zip | |
Merge pull request #2403 from google/down-integrate-with-msvc-fix
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 4763d949..0d8fe103 100644 --- a/Makefile.am +++ b/Makefile.am @@ -605,6 +605,8 @@ php_EXTRA_DIST= \ php/tests/test.proto \ php/tests/test.pb.php \ php/tests/memory_leak_test.php \ + php/tests/google/protobuf/empty.pb.php \ + php/tests/well_known_test.php \ php/README.md \ php/ext/google/protobuf/utf8.h \ php/ext/google/protobuf/message.c \ @@ -712,6 +714,7 @@ python_EXTRA_DIST= \ python/google/protobuf/pyext/repeated_composite_container.h \ python/google/protobuf/pyext/repeated_scalar_container.cc \ 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/reflection.py \ python/google/protobuf/service.py \ |