]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b34343 0a950a0)
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 30 Dec 2013 06:38:45 +0000 (07:38 +0100)
committerRemi Collet <remi@php.net>
Mon, 30 Dec 2013 06:38:45 +0000 (07:38 +0100)
* PHP-5.6:
  Sync with pecl/zip 1.12.4dev

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.