]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8efd73c cd387b4)
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Wed, 17 Dec 2014 01:13:13 +0000 (02:13 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 17 Dec 2014 01:13:13 +0000 (02:13 +0100)
* PHP-5.4:
  add missing NEWS entry
  5.4.37

Conflicts:
configure.in
main/php_version.h


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