summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-08-27 12:11:35 +0200
committerAnatol Belski <ab@php.net>2014-08-27 12:11:35 +0200
commit4d667eeaf39853c4c7cbae9f5eaad40c704bffe8 (patch)
treee6067929a106663b269f035b2d7306dc7641294e /ext/zip/php_zip.c
parent1d6e9e8fb7b2340f775798b334f9bc0fa2c526f0 (diff)
parent7fac56e0729385bbd2bb040f06a20a697d9de5fd (diff)
downloadphp-git-4d667eeaf39853c4c7cbae9f5eaad40c704bffe8.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fixed DBG_INF macro name
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions