summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-02-01 12:41:33 -0800
committerStanislav Malyshev <stas@php.net>2015-02-01 12:41:33 -0800
commit969e3891216b543414c4931957069bdd9fa7f6cf (patch)
tree14c0d1506bfaebc2000345ad58b3d4e8f7f48c4e /ext/json/json.c
parent263fb375bdec5f4c9595dd95b091d0f2353e72c0 (diff)
parent0bfcc2829c8e0055787633b1afb9779753175594 (diff)
downloadphp-git-969e3891216b543414c4931957069bdd9fa7f6cf.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fix sizeof size
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions