diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-11 16:00:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-11 16:00:00 +0800 |
| commit | d4f9bbfae248687c1aa68370564b14544eb4eafd (patch) | |
| tree | abfd96c91da904b04a87838dc1c5477d9d817f70 /.gitattributes | |
| parent | 5ae7540abd241a9d0453ce8a37637068140897a9 (diff) | |
| parent | e1180b4f1aea83ee5dc7f62832a10056e0f62f18 (diff) | |
| download | php-git-d4f9bbfae248687c1aa68370564b14544eb4eafd.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 1f4a7195b7..9ed6e5f4b9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,6 +15,7 @@ ext/dba/libflatfile/flatfile.c ident ext/dba/libcdb/cdb_make.c ident ext/dba/libcdb/cdb.c ident ext/filter/filter.c ident +ext/zip/php_zip.c ident README.input_filter ident run-tests.php ident sapi/nsapi/nsapi.c ident |