]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b5e878 b0a26ab)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Tue, 6 Jan 2015 22:00:11 +0000 (23:00 +0100)
committerFerenc Kovacs <tyrael@php.net>
Tue, 6 Jan 2015 22:00:11 +0000 (23:00 +0100)
* PHP-5.6:
  PHP-5.6.6 is next

Conflicts:
configure.in
main/php_version.h


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