diff options
author | Stanislav Malyshev <stas@php.net> | 2015-06-01 22:53:08 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-06-01 22:53:56 -0700 |
commit | e96c64ed5e0786c067259ad8728ded0085762632 (patch) | |
tree | bb2a48869fe158802c8246d4ce3838f47fddbbb4 /ext/json/json_parser.tab.c | |
parent | f863d89b5cc991ebfbb69caacc724ad90513924b (diff) | |
parent | 1cbd25ca15383394ffa9ee8601c5de4c0f2f90e1 (diff) | |
download | php-git-e96c64ed5e0786c067259ad8728ded0085762632.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error
Diffstat (limited to 'ext/json/json_parser.tab.c')
0 files changed, 0 insertions, 0 deletions