]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45351ea 92a46fe)
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 2 Oct 2012 08:00:09 +0000 (10:00 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 2 Oct 2012 08:00:09 +0000 (10:00 +0200)
* PHP-5.3:
  reverted the previous fix for libpng include

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

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