summaryrefslogtreecommitdiff
path: root/ext/intl/php_intl.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-07-07 00:37:24 -0700
committerStanislav Malyshev <stas@php.net>2014-07-07 00:37:59 -0700
commit8ddf9a2dc4f526821b794cc0b6f537d2cc013d27 (patch)
tree622cd0c7ad78435e9e11254bb3616217b0b67e9c /ext/intl/php_intl.c
parentc291033469920fa2155b3b1833731a0aa93257c3 (diff)
parent6c8a570a969b262d233350829ead759364a29e82 (diff)
downloadphp-git-8ddf9a2dc4f526821b794cc0b6f537d2cc013d27.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
Diffstat (limited to 'ext/intl/php_intl.c')
0 files changed, 0 insertions, 0 deletions