diff options
| author | Matteo Beccati <mbeccati@php.net> | 2014-09-16 10:22:49 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2014-09-16 10:22:49 +0200 |
| commit | 24ed330a22288afec2bec156b6d5cf049e575b7f (patch) | |
| tree | 1d73971b5539da273784a83cce3fa9975fcfac0a /ext/mysqlnd/php_mysqlnd.c | |
| parent | a410067d7869f50ccc4f53e002b3f4f823a1f458 (diff) | |
| parent | b8470e19e47bbab40c30d20f231ddd694c0ca669 (diff) | |
| download | php-git-24ed330a22288afec2bec156b6d5cf049e575b7f.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed freetype test on multiple environments
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions