diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:38:35 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-07-19 22:38:35 -0700 |
| commit | df5ee7bc2557fd87a7e296d399cd947d68c1a4d3 (patch) | |
| tree | e2163cddfde6d941e5184c637b4acc10027f0265 /sapi/phpdbg/phpdbg_opcode.c | |
| parent | ec97e78a8d13eb03df962f0e8604a603604b2042 (diff) | |
| parent | 17a53f9e60d0cd01fe271e245efa7306537acbcf (diff) | |
| download | php-git-df5ee7bc2557fd87a7e296d399cd947d68c1a4d3.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Improve fix for #72520
#72482, revert for 5.6 for now
Conflicts:
ext/zip/zip_stream.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_opcode.c')
0 files changed, 0 insertions, 0 deletions