summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-04-08 16:24:20 +0200
committerAnatol Belski <ab@php.net>2013-04-08 16:24:20 +0200
commita9f9ff68a229ffd6ae13cd1b5f20636c51390d50 (patch)
treea668e03223c93bf69153784c8d4db16a210e19f4 /ext/zip/php_zip.c
parentb810878e7d49a780a9699a7c01a24fc117c66b6c (diff)
parenta35d38661225ed171141e3818362a2ee5d63ec2a (diff)
downloadphp-git-a9f9ff68a229ffd6ae13cd1b5f20636c51390d50.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: updated libmagic.patch
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions