diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-07-09 18:51:27 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-07-09 18:51:27 +0200 |
| commit | 64604350f53d6d3bc8c95e1b229a95b12a396291 (patch) | |
| tree | ed8f5d0e7f3589b974fd244d10d76f1f4ed0cbc2 /ext/json/php_json.h | |
| parent | 049abdfb2635f4f05bb4c51eccc246ffcdfa0dfe (diff) | |
| parent | 97b8798520533f062a5c5c422d79cd84526312ce (diff) | |
| download | php-git-64604350f53d6d3bc8c95e1b229a95b12a396291.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed test bug #62312 (warnings changed one more time)
fix valgrind warning
Conflicts:
ext/mysqlnd/mysqlnd.c
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions