]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5241cf7 70c3a72)
Merge branch 'PHP-5.5'
authorAdam Harvey <aharvey@php.net>
Wed, 23 Oct 2013 19:39:16 +0000 (12:39 -0700)
committerAdam Harvey <aharvey@php.net>
Wed, 23 Oct 2013 19:39:16 +0000 (12:39 -0700)
* PHP-5.5:
  Increment version number, since this will be 5.5.6.

Conflicts:
configure.in
main/php_version.h


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