]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorChristoph M. Becker <cmbecker69@gmx.de>
Mon, 19 Sep 2016 23:38:28 +0000 (01:38 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Mon, 19 Sep 2016 23:38:28 +0000 (01:38 +0200)
1  2 
ext/gd/gd.c
ext/gd/libgd/gdft.c

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