]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2718cb 2b8e943)
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Thu, 19 Apr 2012 18:03:12 +0000 (11:03 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 19 Apr 2012 18:03:12 +0000 (11:03 -0700)
* PHP-5.4:
  fix RCs
  Update to 5.4.2-dev

Conflicts:
main/php_version.h


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