]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Sun, 19 Jul 2015 20:40:49 +0000 (22:40 +0200)
committerChristoph M. Becker <cmb@php.net>
Sun, 19 Jul 2015 20:40:49 +0000 (22:40 +0200)
* PHP-5.6:
  updated NEWS
  Fix #70102: imagecreatefromwebm() shifts colors

1  2 
ext/gd/libgd/webpimg.c

Simple merge