]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d78f5ab 85fae63)
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 22 Jan 2013 08:36:26 +0000 (00:36 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 22 Jan 2013 08:36:26 +0000 (00:36 -0800)
commit92b5bdc231ede3879df048d9ba061d2369c3102e
tree905ec84741dceba1b0b4a5d7effd783eb64504fdtree | snapshot
parentd78f5ababe4ce5503feead535308715f27727c50commit | diff
parent85fae636d09a08b53ffd7244cc6e8ec4d4cdab7ccommit | diff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Merge fix of #62836 to ?.re, and regenerate ?.c
  Fixed bug #64007 (There is an ability to create instance of Generator by hand).
  - Fixed ZTS build
  Class Name Resolution As Scalar Via "class" Keyword
Unnamed repository; edit this file 'description' to name the repository.