diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-10 14:05:07 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-10 14:05:07 +0200 |
| commit | 13211f201a293c3b04b685fdc7167d34f7664dd1 (patch) | |
| tree | 26beae938ba0c092c408ae1488f98b25c5e90949 /ext/json/php_json.h | |
| parent | 024cd2a124bcf54a050588d627308ac0426b46c2 (diff) | |
| parent | b2f2e1d6ccf5e4e282799c6639548833d766985a (diff) | |
| download | php-git-13211f201a293c3b04b685fdc7167d34f7664dd1.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails
Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt
Conflicts:
ext/spl/tests/bug60082.phpt
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions