com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/gd/gd.c ext/gd/libgd/gd_interpolation.c
| From: | Remi Collet | Date: | Wed, 12 Mar 2014 14:36:08 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/gd/gd.c ext/gd/libgd/gd_interpolation.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76466@lists.php.net to get a copy of this message | ||
Commit: 5bd13c523125a552f712f87a0ae55bb236c8fb54
Author: Remi Collet <remi@php.net> Wed, 12 Mar 2014 15:36:08 +0100
Parents: 5e93a213f66c06650c5a8bbfd05f00265c2a5d79 f2d5b2b6c657db29af3bc92d93645ff66574b56f
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5bd13c523125a552f712f87a0ae55bb236c8fb54
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed Bug #66893i imagescale ignore method argument
Bugs:
https://bugs.php.net/66893
Changed paths:
MM ext/gd/gd.c
MM ext/gd/libgd/gd_interpolation.c
Diff: