]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Wed, 24 Oct 2012 08:35:07 +0000 (10:35 +0200)
committerAnatoliy Belsky <ab@php.net>
Wed, 24 Oct 2012 08:35:07 +0000 (10:35 +0200)
commit3b7ee4dced6f20a41ed29f35ef06e7293a670cdc
tree21296b1adedceaaec5ab6d847edfae6e0c247a4c
parent22d4205783238a1030ea97782afd6104155ca4ac
parentb48e163c35f3d56e151946317e982991199d597a
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  enabled libxpm for gd on windows