com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/gd/config.m4 ext/gd/gd.c
| From: | Pierre Joye | Date: | Wed, 10 Apr 2013 18:13:46 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/gd/config.m4 ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71913@lists.php.net to get a copy of this message | ||
Commit: 87f5d9aa1bb9bdbfaecce5ad4739788a7719358f
Author: Pierre Joye <pierre.php@gmail.com> Wed, 10 Apr 2013 20:13:46 +0200
Parents: 2b3a4afcbfc2786a075ef8a7410a495f102314ec c480bf3fb2f04952f4421df197c58b07b479c1c1
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=87f5d9aa1bb9bdbfaecce5ad4739788a7719358f
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add external 2.1 detection and fix gd_compat for 2.1+
Changed paths:
MM ext/gd/config.m4
MM ext/gd/gd.c
Diff: