]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af967de 782085b)
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)
* PHP-5.4:
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence

1  2 
ext/zip/php_zip.c patch | diff1 | diff2 | blob | history

diff --cc ext/zip/php_zip.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.