]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 324291e d7a45a6)
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)
* PHP-5.5:
  Switch to using freetype-config for freetype detection.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.