]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Sun, 8 Dec 2013 03:41:44 +0000 (19:41 -0800)
committerAdam Harvey <aharvey@php.net>
Sun, 8 Dec 2013 03:41:44 +0000 (19:41 -0800)
commitd40a5a2797970a316e32a3f6af18f0ce6e1c264a
tree6541c0ba515d3871c10c395aab625c4edcdca80b
parent324291ebf297f566ab8e77360e0da6a42c571027
parentd7a45a67be2b82272a908cff54cc4d78a3c6e206
Merge branch 'PHP-5.5' into PHP-5.6

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