diff options
| author | Keyur Govande <keyur@php.net> | 2014-08-15 23:47:06 +0000 |
|---|---|---|
| committer | Keyur Govande <keyur@php.net> | 2014-08-15 23:47:06 +0000 |
| commit | 032dee4982f16363e648a52fa79073cb4519efa1 (patch) | |
| tree | 3ca2fe6d8e934a05d5aa79405edb1eba7ea2e0f8 /sapi/cli/php_cli_server.c | |
| parent | 3e6cfeed8f4c3410bbb67c45585510654e0c7425 (diff) | |
| parent | 6279246d2c60437c583f9c273075579bf17be654 (diff) | |
| download | php-git-032dee4982f16363e648a52fa79073cb4519efa1.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update NEWS
Fix another failing test
Add NEWS
Fix failing tests
Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)
Conflicts:
ext/mysqli/tests/mysqli_change_user.phpt
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions