]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Sun, 8 Dec 2013 03:42:00 +0000 (19:42 -0800)
committerAdam Harvey <aharvey@php.net>
Sun, 8 Dec 2013 03:42:00 +0000 (19:42 -0800)
* PHP-5.6:
  Switch to using freetype-config for freetype detection.


Trivial merge