summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-02-17 10:21:59 +0100
committerAnatol Belski <ab@php.net>2014-02-17 10:21:59 +0100
commit3d1d48a85f4418968f69cd02c59736a25d2b422b (patch)
tree338a15a7a3d837320b1411501068339c226bd54f /ext/json/php_json.h
parent24092b7196653b780abf7e420423836df8592751 (diff)
parent6877af3f7138d5c7c125c7f1c058e3661772240c (diff)
downloadphp-git-3d1d48a85f4418968f69cd02c59736a25d2b422b.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: simplify the metadata part
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions