]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Mon, 6 May 2013 08:02:34 +0000 (10:02 +0200)
committerRemi Collet <remi@php.net>
Mon, 6 May 2013 08:02:34 +0000 (10:02 +0200)
* PHP-5.5:
  Revert removal of overflow2 use in gd.c Function provided by gd_security with bundled libgd Function provided by gd_compat with system libgd

1  2 
ext/gd/gd.c

diff --cc ext/gd/gd.c
Simple merge