com php-src: Merge branch 'PHP-5.5': ext/gd/gd.c ext/gd/libgd/gd.h
| From: | Remi Collet | Date: | Wed, 24 Apr 2013 14:11:34 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': ext/gd/gd.c ext/gd/libgd/gd.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72006@lists.php.net to get a copy of this message | ||
Commit: 5897696a0288b9e3abc292559d3ae07793f7c670
Author: Remi Collet <remi@php.net> Wed, 24 Apr 2013 16:11:34 +0200
Parents: 7264179eef2a17d04a0c86ec5b99f5b889acda12 dd0399f5c6d2acfe53621f9e5daf61c57e8e66c6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5897696a0288b9e3abc292559d3ae07793f7c670
Log:
Merge branch 'PHP-5.5'
* PHP-5.5:
We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
gd: fix proto comment
Changed paths:
MM ext/gd/gd.c
MM ext/gd/libgd/gd.h
Diff: