]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorAnatoliy Belsky <ab@php.net>
Wed, 24 Oct 2012 08:35:52 +0000 (10:35 +0200)
committerAnatoliy Belsky <ab@php.net>
Wed, 24 Oct 2012 08:35:52 +0000 (10:35 +0200)
* PHP-5.4:
  enabled libxpm for gd on windows


Trivial merge