diff options
author | Keyur Govande <keyur@php.net> | 2015-01-26 21:32:32 +0000 |
---|---|---|
committer | Keyur Govande <keyur@php.net> | 2015-01-26 21:32:32 +0000 |
commit | 168877bc78376fe7c0e3130c5305c66d2865eb38 (patch) | |
tree | 62cdb91bde84d95ac9e5e1c7676090955d47ddc3 /sapi/phpdbg/phpdbg_prompt.c | |
parent | 4c6918ec17dba26203c0ff3330dccf8b5f84d867 (diff) | |
parent | d065a2fc1baa01fa8788c9fb2811ce7707cf5088 (diff) | |
download | php-git-168877bc78376fe7c0e3130c5305c66d2865eb38.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add NEWS
Patch commit d9f85373e32 by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
Conflicts:
ext/mysqlnd/config9.m4
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
0 files changed, 0 insertions, 0 deletions