]> granicus.if.org Git - php/commit
Merge in master, fix merge conflicts and update patch to support exceptions everywhere
authorAnthony Ferrara <ircmaxell@gmail.com>
Wed, 18 Mar 2015 14:50:11 +0000 (10:50 -0400)
committerAnthony Ferrara <ircmaxell@gmail.com>
Wed, 18 Mar 2015 14:50:11 +0000 (10:50 -0400)
commitd22bfb8aa68fe61eae1c0e124bd3002c7d42e5c4
treebcdb7aa05fb595cea2015e5c71243f004b39e2cf
parent7c8d1e0bd728dcbda16b1bc8a5bcac25c193e699
parent5c6db3b0f2a8fdc1ad5221abc9450d0599fc5ece
Merge in master, fix merge conflicts and update patch to support exceptions everywhere
Zend/zend_API.c
Zend/zend_API.h
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_execute.c
Zend/zend_globals.h
Zend/zend_types.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/gd/gd.c
ext/mysqli/mysqli_api.c