diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-04-10 14:55:38 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-04-10 14:55:38 +0200 |
| commit | 06b2d66ce259372883e0742be3930a3a10494261 (patch) | |
| tree | 26beae938ba0c092c408ae1488f98b25c5e90949 /ext/json/php_json.h | |
| parent | 13211f201a293c3b04b685fdc7167d34f7664dd1 (diff) | |
| parent | fde96342e82a11ebeffd7385db1a3ae54663ef5f (diff) | |
| download | php-git-06b2d66ce259372883e0742be3930a3a10494261.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails
Conflicts:
ext/standard/tests/file/file_put_contents_variation8-win32.phpt
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions