diff options
| author | Adam Harvey <aharvey@php.net> | 2013-12-07 19:41:44 -0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-12-07 19:41:44 -0800 |
| commit | d40a5a2797970a316e32a3f6af18f0ce6e1c264a (patch) | |
| tree | 6541c0ba515d3871c10c395aab625c4edcdca80b /sapi/apache2handler/mod_php5.c | |
| parent | 324291ebf297f566ab8e77360e0da6a42c571027 (diff) | |
| parent | d7a45a67be2b82272a908cff54cc4d78a3c6e206 (diff) | |
| download | php-git-d40a5a2797970a316e32a3f6af18f0ce6e1c264a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Switch to using freetype-config for freetype detection.
Diffstat (limited to 'sapi/apache2handler/mod_php5.c')
0 files changed, 0 insertions, 0 deletions