diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-04-19 23:45:21 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-04-19 23:45:21 -0700 |
| commit | 7d93363bd9ea03c11bfbeea03645260506ef9a2e (patch) | |
| tree | 5c655adaa25b7afdb68839cbc5eeda9ef8795865 /Zend/zend_execute.c | |
| parent | 086729bb6c4e88a61ff3ea470fac5d17c2d31786 (diff) | |
| parent | c02301b666f61e73da3ae73f712823cf64a9299d (diff) | |
| download | php-git-7d93363bd9ea03c11bfbeea03645260506ef9a2e.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Better fix for #71952
Conflicts:
ext/gd/gd.c
Diffstat (limited to 'Zend/zend_execute.c')
0 files changed, 0 insertions, 0 deletions