summaryrefslogtreecommitdiff
path: root/ext/zip/lib/zip_source_function.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-10-28 15:23:10 +0400
committerDmitry Stogov <dmitry@zend.com>2013-10-28 15:23:10 +0400
commit592be912c2e0cc94a665884285de20d35d34ff3b (patch)
tree5e226260fe723f022b0ccd43a82f51b606ecb149 /ext/zip/lib/zip_source_function.c
parentace2ee931cb55acec6ef18b65cd5058e744b553d (diff)
parent2d14cc2a4986a3a2afd94c79283ab1dc8a3fe157 (diff)
downloadphp-git-592be912c2e0cc94a665884285de20d35d34ff3b.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: Use zval* instead of zval** Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
Diffstat (limited to 'ext/zip/lib/zip_source_function.c')
0 files changed, 0 insertions, 0 deletions