]> granicus.if.org Git - php/commit
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)
commit26e492f2f3d3e26f7320957172e37ee49f6e6112
treeb3bf9d9d23dc26ce10deaeef2b93f1f24dd6f3eb
parent45351eaab4d8f065c5948de5f28df975b36d592c
parent92a46fe07e4407d52eb384c48aec5a3538731341
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  reverted the previous fix for libpng include
ext/gd/config.w32