]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* '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


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