summaryrefslogtreecommitdiff
path: root/ext/intl/php_intl.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2012-06-23 21:15:59 +0200
committerNikita Popov <nikic@php.net>2012-06-23 21:15:59 +0200
commitd68b614b09b984e915db50b72430db4e4731480c (patch)
tree2826c121a85bb3556dffdf971709574efd80d3a2 /ext/intl/php_intl.c
parent1fc5659ebd6f2898ab474087f7877bcc4e774403 (diff)
parent36fa17a5fae84ab332366a202f0a709279a2466a (diff)
downloadphp-git-d68b614b09b984e915db50b72430db4e4731480c.tar.gz
Merge branch 'PHP-5.4'
* PHP-5.4: Improve json_encode error handling - BFN - BFN
Diffstat (limited to 'ext/intl/php_intl.c')
0 files changed, 0 insertions, 0 deletions