diff options
author | Remi Collet <remi@php.net> | 2014-10-27 07:50:42 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2014-10-27 07:50:42 +0100 |
commit | 0146505187089ceba5afe422c80320809ae4942a (patch) | |
tree | 69b128a68c9e7228ae875c954d1b847cce2c09f0 /sapi/phpdbg/phpdbg_out.c | |
parent | 50756b515c76bb9c43a01bfce03207906f596005 (diff) | |
parent | 88527e456951d13a681fbef65984bc3c4907fded (diff) | |
download | php-git-0146505187089ceba5afe422c80320809ae4942a.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Conflicts:
ext/gmp/gmp.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_out.c')
0 files changed, 0 insertions, 0 deletions