summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2016-04-18 23:34:26 -0700
committerStanislav Malyshev <stas@php.net>2016-04-18 23:34:26 -0700
commit086729bb6c4e88a61ff3ea470fac5d17c2d31786 (patch)
tree5c655adaa25b7afdb68839cbc5eeda9ef8795865 /Zend/zend_execute.c
parent5ea2b3625d78a5604ba33d91f0bd9bb187138220 (diff)
parentf061867fd385109861d128ae6f3e2484fc4daa72 (diff)
downloadphp-git-086729bb6c4e88a61ff3ea470fac5d17c2d31786.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Fix bug #71952: Corruption inside imageaffinematrixget Conflicts: ext/gd/gd.c
Diffstat (limited to 'Zend/zend_execute.c')
0 files changed, 0 insertions, 0 deletions