]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Wed, 24 Apr 2013 14:11:34 +0000 (16:11 +0200)
committerRemi Collet <remi@php.net>
Wed, 24 Apr 2013 14:11:34 +0000 (16:11 +0200)
* PHP-5.5:
  We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
  gd: fix proto comment

1  2 
ext/gd/gd.c
ext/gd/libgd/gd.h

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