]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7dd8714 daf9357)
Merge branch 'PHP-5.5' into PHP-5.6
authorMatteo Beccati <mbeccati@php.net>
Wed, 29 Oct 2014 10:32:12 +0000 (11:32 +0100)
committerMatteo Beccati <mbeccati@php.net>
Wed, 29 Oct 2014 10:32:12 +0000 (11:32 +0100)
* PHP-5.5:
  Fixed test to work with recent libcurl versions
  PHP 5.5.20 now

Conflicts:
configure.in
main/php_version.h


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