com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/gd/tests/ gd_info_variation1.phpt
| From: | Christoph Michael Becker | Date: | Mon, 25 Jul 2016 00:02:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/gd/tests/ gd_info_variation1.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93371@lists.php.net to get a copy of this message | ||
Commit: 138fea83fe880749005cf764e9843feb56331a9d
Author: Christoph M. Becker <cmb@php.net> Mon, 25 Jul 2016 02:02:54 +0200
Parents: 4db4997ac5b903976d42688c62c0e2216ee6f052 305bddb0ede8290fdd53e0c75e71834e0dc63512
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=138fea83fe880749005cf764e9843feb56331a9d
Log:
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/gd/tests/gd_info_variation1.phpt
Changed paths:
MM ext/gd/tests/gd_info_variation1.phpt
Diff:
diff --cc ext/gd/tests/gd_info_variation1.phpt
index 3b46695,8fa1f49..7495d26
--- a/ext/gd/tests/gd_info_variation1.phpt
+++ b/ext/gd/tests/gd_info_variation1.phpt
@@@ -27,7 -27,9 +27,7 @@@ array(%d)
["GD Version"]=>
string(%d) %s
["FreeType Support"]=>
- bool(%s)
+ bool(%a
- ["T1Lib Support"]=>
- bool(%s)
["GIF Read Support"]=>
bool(%s)
["GIF Create Support"]=>