]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 7 Sep 2015 11:55:19 +0000 (13:55 +0200)
committerRemi Collet <remi@php.net>
Mon, 7 Sep 2015 11:55:19 +0000 (13:55 +0200)
commita5d6cf788ea9554cb7dc0b53ab84fc614048e98d
tree7e33f6bb6807b13b18dde7b5f8f34e0746a5943c
parentaa352a34fd1077995ec159ba30a6cf62c70e64c7
parentdebfc866d2971c69d4f47662fb4bb70feb0c0007
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix build
ext/zip/php_zip.c