]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54187fa 15e9f4b)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Wed, 5 Aug 2015 07:00:54 +0000 (00:00 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 5 Aug 2015 07:00:54 +0000 (00:00 -0700)
* PHP-5.5:
  5.5.29 next

Conflicts:
configure.in
main/php_version.h


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