]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60871e5 c08e2c8)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 25 Nov 2012 00:30:00 +0000 (16:30 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 25 Nov 2012 00:30:00 +0000 (16:30 -0800)
* PHP-5.4:
  fix NEWS
  5.4.10-dev

Conflicts:
configure.in
main/php_version.h


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