archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.6' into PHP-7.0

Browse source 
# Resolved conflicts:
#	ext/gd/tests/gd_info_variation1.phpt
This commit is contained in:
Christoph M. Becker 2016-07-25 02:02:54 +02:00
commit 138fea83fe
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/gd/tests/gd_info_variation1.phpt
View file

@ -27,7 +27,7 @@ array(%d) {
["GD Version"]=> ["GD Version"]=>
string(%d) %s string(%d) %s
["FreeType Support"]=> ["FreeType Support"]=>
bool(%s) bool(%a
["GIF Read Support"]=> ["GIF Read Support"]=>
bool(%s) bool(%s)
["GIF Create Support"]=> ["GIF Create Support"]=>