diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-25 02:02:54 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-25 02:02:54 +0200 |
| commit | 138fea83fe880749005cf764e9843feb56331a9d (patch) | |
| tree | 148462d4664ffbf3a99e57af2e28f38ca72ea678 | |
| parent | 4db4997ac5b903976d42688c62c0e2216ee6f052 (diff) | |
| parent | 305bddb0ede8290fdd53e0c75e71834e0dc63512 (diff) | |
| download | php-git-138fea83fe880749005cf764e9843feb56331a9d.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/gd/tests/gd_info_variation1.phpt
| -rw-r--r-- | ext/gd/tests/gd_info_variation1.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/gd/tests/gd_info_variation1.phpt b/ext/gd/tests/gd_info_variation1.phpt index 3b4669561f..7495d26e11 100644 --- a/ext/gd/tests/gd_info_variation1.phpt +++ b/ext/gd/tests/gd_info_variation1.phpt @@ -27,7 +27,7 @@ array(%d) { ["GD Version"]=> string(%d) %s ["FreeType Support"]=> - bool(%s) + bool(%a ["GIF Read Support"]=> bool(%s) ["GIF Create Support"]=> |