]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a47c5ed 9a48b65)
Merge branch 'PHP-5.5'
authorRemi Collet <remi@php.net>
Sun, 5 May 2013 06:35:34 +0000 (08:35 +0200)
committerRemi Collet <remi@php.net>
Sun, 5 May 2013 06:35:34 +0000 (08:35 +0200)
* PHP-5.5:
  gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd

1  2 
ext/gd/gd.c patch | diff1 | diff2 | blob | history

diff --cc ext/gd/gd.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.