]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52b9300 646b4cc)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 15 Oct 2014 12:10:38 +0000 (14:10 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 15 Oct 2014 12:10:38 +0000 (14:10 +0200)
* PHP-5.6:
  PHP-5.6.3 is next
  update NEWS, 5.6.2 will be a security-only release

Conflicts:
configure.in
main/php_version.h


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