]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Wed, 10 Apr 2013 18:45:28 +0000 (20:45 +0200)
committerAnatol Belski <ab@php.net>
Wed, 10 Apr 2013 18:45:28 +0000 (20:45 +0200)
commit0655ab7c261840d8068c7360af5cda5351cffc22
tree76b8b6c80bf8e3614eea4e08697e2d76d3e26958
parentaf967de2afc584c602c0b6d4d6731e411323d94e
parent782085bbfbb6fff07c59b3528285bc619ee5847b
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
ext/zip/php_zip.c