]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Thu, 4 Oct 2012 16:21:07 +0000 (18:21 +0200)
committerAnatoliy Belsky <ab@php.net>
Thu, 4 Oct 2012 16:21:07 +0000 (18:21 +0200)
* PHP-5.3:
  exposing the libxpm version in phpinfo

1  2 
ext/gd/gd.c

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