Permalink
Browse files

Merge branch 'PHP-5.3' into PHP-5.4

  • Loading branch information...
2 parents 5ae7540 + e1180b4 commit d4f9bbfae248687c1aa68370564b14544eb4eafd @laruence laruence committed Aug 11, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitattributes
View
@@ -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

0 comments on commit d4f9bbf

Please sign in to comment.