]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0da85b 119821a)
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Wed, 12 Mar 2014 12:46:51 +0000 (13:46 +0100)
committerRemi Collet <remi@php.net>
Wed, 12 Mar 2014 12:46:51 +0000 (13:46 +0100)
* PHP-5.5:
  NEWS
  Fixed Bug #66890 imagescale segfault

1  2 
ext/gd/gd.c patch | diff1 | diff2 | blob | history

diff --cc ext/gd/gd.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.