summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2015-06-17 02:18:53 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2015-06-17 02:18:53 +0200
commit7958a7b38fd90dc0c51e2be4db3a0be90fd60c32 (patch)
tree4275c2651147bddc3f49682d4aa607a724080a9c /ext/pcre/php_pcre.c
parentc661e7680fa609d8a78fb834c9e6d006febe9281 (diff)
parent61d58f2d9e9175786406dd11178190644a1e0183 (diff)
downloadphp-git-7958a7b38fd90dc0c51e2be4db3a0be90fd60c32.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: updated NEWS Fixed bug #61221 - imagegammacorrect function loses alpha channel
Diffstat (limited to 'ext/pcre/php_pcre.c')
0 files changed, 0 insertions, 0 deletions