]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d56850a 60e38b3)
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Wed, 2 Oct 2013 12:40:42 +0000 (05:40 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 2 Oct 2013 12:40:42 +0000 (05:40 -0700)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())


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