]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Wed, 10 Apr 2013 18:13:46 +0000 (20:13 +0200)
committerPierre Joye <pierre.php@gmail.com>
Wed, 10 Apr 2013 18:13:46 +0000 (20:13 +0200)
commit87f5d9aa1bb9bdbfaecce5ad4739788a7719358f
tree5a21cd43ce5ab99ec9863f98c92d4814fa645189
parent2b3a4afcbfc2786a075ef8a7410a495f102314ec
parentc480bf3fb2f04952f4421df197c58b07b479c1c1
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add external 2.1 detection and fix gd_compat for 2.1+
ext/gd/config.m4
ext/gd/gd.c