diff options
| author | Christopher Jones <sixd@php.net> | 2013-10-01 10:19:40 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-10-01 10:19:40 -0700 |
| commit | ec5b87c50dd9b77bd3b638157f317749237d5566 (patch) | |
| tree | 05cb7eba9243e03a4d2f00653f235d3f59dbf305 /sapi/phpdbg/phpdbg_list.c | |
| parent | aeb6e9c264fc0054fb829da13c739cdafa276115 (diff) | |
| parent | 4b61203b013468992dc86dea74379a5688ba19c7 (diff) | |
| download | php-git-ec5b87c50dd9b77bd3b638157f317749237d5566.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (3) and Christopher Jones (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
Reverted patch (it was used for internal testing and was committed by accident)
Diffstat (limited to 'sapi/phpdbg/phpdbg_list.c')
0 files changed, 0 insertions, 0 deletions