]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Mon, 24 Jun 2013 09:15:56 +0000 (11:15 +0200)
committerRemi Collet <remi@php.net>
Mon, 24 Jun 2013 09:15:56 +0000 (11:15 +0200)
commit8e4e38aaeea0944a976fd2629c210c87483dcb3f
tree78fd9846da632543e7cbfb6a3cc8363377767a8c
parent8c694401bb817ce645abe87c094615a3d5ed87ce
parent9da4985bf2d532ed72fbd3a7d3390464692cce7a
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix imagecreatefromwebp and imagewebp protos
ext/gd/gd.c