summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2014-03-12 13:46:51 +0100
committerRemi Collet <remi@php.net>2014-03-12 13:46:51 +0100
commitc8c1205d84b37608901b9e588ceff566d1fa63eb (patch)
tree5f5424236ef78991a379ff771b28597e4edeb3ea /ext/pcre/php_pcre.c
parentf0da85b4923d9a4c48d75f76bf78728aae18e2a3 (diff)
parent119821a452c64f9723cdc2597bb4327e45a11df9 (diff)
downloadphp-git-c8c1205d84b37608901b9e588ceff566d1fa63eb.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: NEWS Fixed Bug #66890 imagescale segfault
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions