diff options
author | Matteo Beccati <mbeccati@php.net> | 2014-09-16 10:22:34 +0200 |
---|---|---|
committer | Matteo Beccati <mbeccati@php.net> | 2014-09-16 10:22:34 +0200 |
commit | b8470e19e47bbab40c30d20f231ddd694c0ca669 (patch) | |
tree | 6bddff665183255ea91ed7dd8abed136bba410f2 /sapi/tux/php_tux.c | |
parent | ad0b63cad4e372c6d063ec2d5df8782fd63de06a (diff) | |
parent | 00525b824af4265e7fc74d3655a04da9c4c667f7 (diff) | |
download | php-git-b8470e19e47bbab40c30d20f231ddd694c0ca669.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed freetype test on multiple environments
Diffstat (limited to 'sapi/tux/php_tux.c')
0 files changed, 0 insertions, 0 deletions