diff options
| author | Xinchen Hui <laruence@php.net> | 2012-07-09 08:46:38 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-07-09 08:46:38 +0800 |
| commit | 0e97cdf86b8db73c5d80e5eaeb7efc99ae6383de (patch) | |
| tree | 25e9eddb1cc60703cef40c746c979f137b85464e /ext/json/php_json.h | |
| parent | e6d9cd983b3503d38389d0c67267c773a98af174 (diff) | |
| parent | 4323a7acedf0eff76f709456930d89380c16f0b8 (diff) | |
| download | php-git-0e97cdf86b8db73c5d80e5eaeb7efc99ae6383de.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
update NEWS
Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
appease MSVC (doesnt like unary minus of unsigned ints)
appease MSVC (doesnt like unary minus of unsigned ints)
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions