com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend.h Zend/zend_compile.c Zend/zend_compile.h Zend/zend _language_parser.y Zend/zend_opcode.c
| From: | Dmitry Stogov | Date: | Tue, 25 Dec 2012 06:33:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend.h Zend/zend_compile.c Zend/zend_compile.h Zend/zend _language_parser.y Zend/zend_opcode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70811@lists.php.net to get a copy of this message | ||
Commit: b8c719c0687aea8c13241abb5a52eefbac1a3a95
Author: Dmitry Stogov <dmitry@zend.com> Tue, 25 Dec 2012 10:33:01 +0400
Parents: be7b0bc3ec02e4f223920ee6397f9c4993eb7df5 3f8c729e693c432b438cd33679182260d8732e30
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b8c719c0687aea8c13241abb5a52eefbac1a3a95
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Traits refactoring
Changed paths:
MM Zend/zend.h
MM Zend/zend_compile.c
MM Zend/zend_compile.h
MM Zend/zend_language_parser.y
MM Zend/zend_opcode.c
Diff: