diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-11 16:00:30 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-11 16:00:30 +0800 |
| commit | 66a6d1b97b682a37e0d1f2654d7dcbe2eabbbcc7 (patch) | |
| tree | 987f8069b9cfb30981b2c274a195d214dd365c59 | |
| parent | e904f9f4b2918798fb30b1b0b5c641e2ec84dd7a (diff) | |
| parent | d4f9bbfae248687c1aa68370564b14544eb4eafd (diff) | |
| download | php-git-66a6d1b97b682a37e0d1f2654d7dcbe2eabbbcc7.tar.gz | |
Merge branch 'PHP-5.4'
| -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 |