diff options
| author | Bo Yang <teboring@google.com> | 2016-10-13 12:20:24 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-10-13 14:25:43 -0700 |
| commit | 686a19c9b792e44f3e90467d404a9865de0aa330 (patch) | |
| tree | 8f4a3250a966961f68460a2da185922adfc3af75 /Makefile.am | |
| parent | e28286fa05d8327fd6c5aa70cfb3be558f0932b8 (diff) | |
| parent | 60d95f36c0081a03b947c2b625c10841bb19736c (diff) | |
| download | protobuf-686a19c9b792e44f3e90467d404a9865de0aa330.tar.gz protobuf-686a19c9b792e44f3e90467d404a9865de0aa330.tar.bz2 protobuf-686a19c9b792e44f3e90467d404a9865de0aa330.zip | |
Merge 3.1.x into master.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 9f7e3ca8..7e47a119 100644 --- a/Makefile.am +++ b/Makefile.am @@ -600,6 +600,8 @@ php_EXTRA_DIST= \ php/tests/test_include.pb.php \ php/tests/map_field_test.php \ php/tests/test_base.php \ + php/tests/test_no_namespace.proto \ + php/tests/test_no_namespace.pb.php \ php/tests/test_util.php \ php/tests/test.proto \ php/tests/test.pb.php \ |