diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-04 19:57:29 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-04 19:57:29 -0800 |
| commit | 97f894e1899ba9773b8c213b56d34b1f1a9b03d9 (patch) | |
| tree | f2d09728cad5f8ba1e8876f32ae1f3ec2cce9c60 /sapi/cli/php_cli_server.c | |
| parent | 03ae6f22b6e49aa346021ec5dd6ad8a7a16760b2 (diff) | |
| parent | 5639c3350e2d33b7e8f4b3c792f998aad08c293a (diff) | |
| download | php-git-97f894e1899ba9773b8c213b56d34b1f1a9b03d9.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix GD tests with no GD loaded
Fixed typo
GD: imagepalettetotruecolor tests
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions