]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Sat, 11 Jul 2015 15:52:22 +0000 (17:52 +0200)
committerChristoph M. Becker <cmb@php.net>
Sat, 11 Jul 2015 15:52:22 +0000 (17:52 +0200)
* PHP-5.6:
  updated NEWS
  Fix #70047: gd_info() doesn't report WebP support

1  2 
ext/gd/gd.c

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