diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2016-10-13 14:37:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 14:37:21 -0700 |
| commit | ad88f905ae33a4c8824441c53f54736e2ae357dd (patch) | |
| tree | 8f4a3250a966961f68460a2da185922adfc3af75 /Makefile.am | |
| parent | e28286fa05d8327fd6c5aa70cfb3be558f0932b8 (diff) | |
| parent | 686a19c9b792e44f3e90467d404a9865de0aa330 (diff) | |
| download | protobuf-ad88f905ae33a4c8824441c53f54736e2ae357dd.tar.gz protobuf-ad88f905ae33a4c8824441c53f54736e2ae357dd.tar.bz2 protobuf-ad88f905ae33a4c8824441c53f54736e2ae357dd.zip | |
Merge pull request #2251 from TeBoring/master
Merge 3.1.x branch 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 \ |