]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Sun, 24 May 2015 07:39:20 +0000 (09:39 +0200)
committerRemi Collet <remi@php.net>
Sun, 24 May 2015 07:39:20 +0000 (09:39 +0200)
* PHP-5.5:
  NEWS
  Fixed Bug #69479 GD fails to build with newer libvpx

1  2 
ext/gd/libgd/webpimg.c

Simple merge