diff options
| author | Adam Harvey <aharvey@php.net> | 2013-12-07 19:41:23 -0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-12-07 19:41:23 -0800 |
| commit | d7a45a67be2b82272a908cff54cc4d78a3c6e206 (patch) | |
| tree | 56bc7b99ba3e6e331b95e93d182fe5d26cc98cad /ext/zip/php_zip.c | |
| parent | edf601a41f4d8b468883c25f3981d20fd2a9921d (diff) | |
| parent | a0955f351c7eb1022da7ae36970ffef3b00c8aff (diff) | |
| download | php-git-d7a45a67be2b82272a908cff54cc4d78a3c6e206.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Switch to using freetype-config for freetype detection.
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions