]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Thu, 12 Feb 2015 19:29:24 +0000 (20:29 +0100)
committerAnatol Belski <ab@php.net>
Thu, 12 Feb 2015 19:29:24 +0000 (20:29 +0100)
* PHP-5.5:
  backport gd config.w32 to support freetype 2.5


Trivial merge