]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Fri, 21 Jun 2019 14:01:28 +0000 (16:01 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Fri, 21 Jun 2019 14:01:28 +0000 (16:01 +0200)
* PHP-7.4:
  Properly shut down font cache mutex

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