]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
authorULF WENDEL <uw@php.net>
Tue, 23 Oct 2012 11:15:46 +0000 (13:15 +0200)
committerULF WENDEL <uw@php.net>
Tue, 23 Oct 2012 11:15:46 +0000 (13:15 +0200)
commitbac9d118edb6b54cb9cfa80fefdc2d46609efebc
tree6a565606843fcf2fc7d43baa9766b51f66ae153d
parentdfeb91acc7d44cc5035db34a31310dc3075df11f
parent6e23cfeba48cc10fe59d3dacfea90ccb1a2f1dd4
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3

* 'PHP-5.3' of git.php.net:php-src:
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows