]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Thu, 11 Apr 2013 05:08:39 +0000 (07:08 +0200)
committerPierre Joye <pierre.php@gmail.com>
Thu, 11 Apr 2013 05:08:39 +0000 (07:08 +0200)
commite71b7945698c4df46c30d14108e61af2953ae233
tree6ee6f883db9a33071f4bebf59274eec71f772c4b
parent6df1e8d3fe014ea9a3e42a371a16c6f9cd397bbb
parent4475dbf11d6660818537ae706583b7c15139c13f
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  lucky that the name is not used, fix name of encoder
ext/gd/gd.c