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

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