summaryrefslogtreecommitdiff
path: root/ext/intl/php_intl.h
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2012-05-24 13:43:35 -0300
committerFelipe Pena <felipensp@gmail.com>2012-05-24 13:43:35 -0300
commit84b2c39920ff02c86a46eb9191c140a887938371 (patch)
tree2eb6981dc3cdcad02f648aa5e47138c56e0c8660 /ext/intl/php_intl.h
parenta10da87c6a2cadc5151d185573b0125d06daad6b (diff)
parent11b4f3becd371dae9f76ec18d2197edf53130db7 (diff)
downloadphp-git-84b2c39920ff02c86a46eb9191c140a887938371.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: - Fixed magic file regex support
Diffstat (limited to 'ext/intl/php_intl.h')
0 files changed, 0 insertions, 0 deletions