]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Tue, 2 Oct 2012 07:41:24 +0000 (09:41 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 2 Oct 2012 07:41:24 +0000 (09:41 +0200)
* PHP-5.4:
  fixed include checks for libpng under win


Trivial merge