]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Sun, 5 May 2013 07:56:52 +0000 (09:56 +0200)
committerRemi Collet <remi@php.net>
Sun, 5 May 2013 07:56:52 +0000 (09:56 +0200)
* PHP-5.5:
  Move (back) missing functions in system libgd to gd_compat - display libPng version in all cases - gd_compat.c in ext/gd (nothing in ext/gd/libgd)

1  2 
ext/gd/gd.c

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