]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Wed, 24 Apr 2013 12:32:09 +0000 (14:32 +0200)
committerRemi Collet <remi@php.net>
Wed, 24 Apr 2013 12:32:09 +0000 (14:32 +0200)
* PHP-5.5:
  gd: provide imageflip with system libgd when available

1  2 
ext/gd/gd.c

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