]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e56c13 fa2a2a1)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 26 Nov 2014 09:24:18 +0000 (10:24 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 26 Nov 2014 09:24:18 +0000 (10:24 +0100)
* PHP-5.6:
  PHP-5.6.5 is next

Conflicts:
configure.in
main/php_version.h


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