]> granicus.if.org Git - php/commit
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)
commitb97156113ea2a513c5fd167571ae40c0e2d1656d
tree3d8edf6ba7f9f998b697a7cc48312a433c9487a5
parent98d929290c7c18c8ea5309c6813e326e2f5d47a7
parentd40a5a2797970a316e32a3f6af18f0ce6e1c264a
Merge branch 'PHP-5.6'

* PHP-5.6:
  Switch to using freetype-config for freetype detection.