summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-08-14 17:21:37 -0700
committerStanislav Malyshev <stas@php.net>2014-08-14 17:21:37 -0700
commit59c2477bc331370105e917db27e82d4e483ab7f0 (patch)
tree55bf3e50406719e4b39506019414fbbb448d1c1b /ext/pcre/php_pcre.c
parent3468f03b6f551d927e64af00eddcc2d73bb82154 (diff)
parent35f32637b08ca6397829138ed45a0768f592f262 (diff)
downloadphp-git-59c2477bc331370105e917db27e82d4e483ab7f0.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fix bug #67716 - Segfault in cdf.c
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions