]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 20 Jun 2019 21:41:23 +0000 (23:41 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 20 Jun 2019 21:41:23 +0000 (23:41 +0200)
* PHP-7.4:
  Support TGA reading

1  2 
ext/gd/gd.c
ext/gd/php_gd.h

diff --cc ext/gd/gd.c
Simple merge
diff --cc ext/gd/php_gd.h
Simple merge