summaryrefslogtreecommitdiff
path: root/ext/intl/php_intl.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-05-31 01:18:02 +0200
committerJohannes Schlüter <johannes@php.net>2012-05-31 01:18:02 +0200
commit33849c2211891cc69d26b3633412635016d05626 (patch)
tree53c02d7f9527bc6ffa5bd0ba825fab167e8cbfac /ext/intl/php_intl.c
parent56532895a851851b4eacebb58cd3a0c7294031b3 (diff)
parent303dd7f3469106f8cd91a8648de1c4fed51374b3 (diff)
downloadphp-git-33849c2211891cc69d26b3633412635016d05626.tar.gz
Merge branch 'PHP-5.4'
* PHP-5.4: Fix bug #62186 readline fails to compile fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)
Diffstat (limited to 'ext/intl/php_intl.c')
0 files changed, 0 insertions, 0 deletions