diff options
| author | Keyur Govande <keyur@php.net> | 2015-01-26 21:36:36 +0000 |
|---|---|---|
| committer | Keyur Govande <keyur@php.net> | 2015-01-26 21:36:36 +0000 |
| commit | 6635466bccef32bb34c4834302585860ce111968 (patch) | |
| tree | 5c8b1b34c43f5101519f288b39f534f4a8c5d715 /sapi/phpdbg/phpdbg_prompt.c | |
| parent | e05993dfa20e934ba99ccd5b2b944a7759126f58 (diff) | |
| parent | 168877bc78376fe7c0e3130c5305c66d2865eb38 (diff) | |
| download | php-git-6635466bccef32bb34c4834302585860ce111968.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
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).
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/mysqli/mysqli_api.c
ext/mysqlnd/mysql_float_to_double.h
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
0 files changed, 0 insertions, 0 deletions