]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorPierre Joye <pierre.php@gmail.com>
Wed, 27 Mar 2013 16:39:05 +0000 (17:39 +0100)
committerPierre Joye <pierre.php@gmail.com>
Wed, 27 Mar 2013 16:39:05 +0000 (17:39 +0100)
* PHP-5.5:
  add WebP support in phpinfo

1  2 
ext/gd/gd.c

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