]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Mon, 13 Jul 2015 13:56:39 +0000 (15:56 +0200)
committerChristoph M. Becker <cmb@php.net>
Mon, 13 Jul 2015 13:56:39 +0000 (15:56 +0200)
* PHP-5.6:
  updated NEWS
  Fix #69024: imagescale segfault with palette based image

1  2 
ext/gd/libgd/gd_interpolation.c

Simple merge