com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/gd/gd.c
| From: | Xinchen Hui | Date: | Fri, 27 Dec 2013 06:06:35 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75474@lists.php.net to get a copy of this message | ||
Commit: 04a52443e7d7fa61f977f4af909e1b294523d321
Author: Xinchen Hui <laruence@php.net> Fri, 27 Dec 2013 14:06:35 +0800
Parents: 03a37de9b3c4b9dc02aeeb5c5331ff89eac62515 2938329ce19cb8c4197dec146c3ec887c6f61d01
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=04a52443e7d7fa61f977f4af909e1b294523d321
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
main/php_version.h
Changed paths:
MM ext/gd/gd.c
Diff: