diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-03 11:43:40 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-03 11:43:40 -0800 |
| commit | acd93dfb6db9e6dce9eceaa68465ec043f8f5567 (patch) | |
| tree | 0901af217943c2ce8aa47060f7b53dd4ea103744 /ext/json/php_json.h | |
| parent | 279550ee85493c87dca91feefe9d5b97af82d323 (diff) | |
| parent | 0ddcf2a919a24cccb36bd0a69b05e6bbfc0bf883 (diff) | |
| download | php-git-acd93dfb6db9e6dce9eceaa68465ec043f8f5567.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Fix bug #63595 GMP memory management conflicts with other libraries using GMP
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions