diff options
| author | Keyur Govande <keyur@php.net> | 2014-08-15 23:13:36 +0000 |
|---|---|---|
| committer | Keyur Govande <keyur@php.net> | 2014-08-15 23:13:36 +0000 |
| commit | 7c4b5d91874ea0a69f5b65c05494056aaae81e71 (patch) | |
| tree | eb121b86478dbfc7f6741e553bbf6032bc093704 /sapi/cli/php_cli.c | |
| parent | 59c2477bc331370105e917db27e82d4e483ab7f0 (diff) | |
| parent | 0407bdf252004cce08e383bc0f4aa0bbc69c9a25 (diff) | |
| download | php-git-7c4b5d91874ea0a69f5b65c05494056aaae81e71.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/table.inc
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions