]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 12 Feb 2015 19:29:51 +0000 (20:29 +0100)
committerAnatol Belski <ab@php.net>
Thu, 12 Feb 2015 19:29:51 +0000 (20:29 +0100)
commit3fe115ae8612bcdb5c77fc5903d3174e5dbb92ca
tree5fe0763465dfd46e2d68d3e5a89fd677417f08c4
parent61a1e8d1574ae11c4432d2d34ae04191aa0a632f
parentd05070c98df7460e1b3d5f182f7ba99298454f58
Merge branch 'PHP-5.6'

* PHP-5.6:
  backport gd config.w32 to support freetype 2.5