]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77fd708 f962260)
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
authorULF WENDEL <uw@php.net>
Tue, 23 Oct 2012 11:16:12 +0000 (13:16 +0200)
committerULF WENDEL <uw@php.net>
Tue, 23 Oct 2012 11:16:12 +0000 (13:16 +0200)
* 'PHP-5.4' of git.php.net:php-src:
  merged changes for bug #63297 from 5.3
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
  enabled libxpm for gd on windows
  Update test script
  Test for #63336, xfail now
  Fixed bug #63305 (zend_mm_heap corrupted with traits)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.