]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/2151'
authorChristoph M. Becker <cmbecker69@gmx.de>
Mon, 17 Oct 2016 08:35:56 +0000 (10:35 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Mon, 17 Oct 2016 08:37:38 +0000 (10:37 +0200)
1  2 
UPGRADING
ext/gd/gd.c
ext/gd/libgd/gd.c
ext/gd/libgd/gd.h

diff --cc UPGRADING
index b874ad6777ad1c2f9fa03a48cf963a631c3459ff,38250ed303a1bd140072bee74b92b5bfe5276f8d..2b4f988370df2daf118d8bc11e78fc73e803ddf8
+++ b/UPGRADING
@@@ -71,6 -70,6 +71,7 @@@ PHP 7.2 UPGRADE NOTE
  
  - GD:
    . Added imagesetclip() and imagegetclip().
++  . Added imageopenpolygon().
  
  - Mbstring:
    . Added mb_chr() and mb_ord().
diff --cc ext/gd/gd.c
Simple merge
Simple merge
Simple merge