diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-10 13:09:48 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-10 13:09:48 +0200 |
| commit | 006b04da4a8a242c971b9641748323065d539069 (patch) | |
| tree | 2ed4004547d7e30dfcbab471348c4352f6b32ec0 /ext/json/php_json.h | |
| parent | 5b0e7203e659cb3866505e4c52812b5eba040e35 (diff) | |
| parent | c4676ee99f5381de502cd6544a9c42a25b53b933 (diff) | |
| download | php-git-006b04da4a8a242c971b9641748323065d539069.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
Fixed bug 61621 Test fail in ext/standard/tests/dir
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions