com php-src: Merge branch 'const_scalar_exprs' into PHP-5.6: Zend/zend.h Zend/zend_API.c Zen d/zend_compile.c Zend/zend_compile.h Zend/zend_op
erators.h Zend/zend_vm_def.h Zend/zend_vm_execu te.h ext/opcache/zend_accelerator_util_funcs.c
| From: | Bob Weinand | Date: | Thu, 28 Nov 2013 12:41:42 +0000 |
| Subject: | com php-src: Merge branch 'const_scalar_exprs' into PHP-5.6: Zend/zend.h Zend/zend_API.c Zen d/zend_compile.c Zend/zend_compile.h Zend/zend_op erators.h Zend/zend_vm_def.h Zend/zend_vm_execu te.h ext/opcache/zend_accelerator_util_funcs.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74111@lists.php.net to get a copy of this message | ||
Commit: d36cf9029110268e8ae7f700f620823dcaab5d8e
Author: Bob Weinand <bobwei9@hotmail.com> Thu, 28 Nov 2013 13:41:42 +0100
Parents: 9d060e8d48bd6b2cc8c2a30f3b0eeeb4d867d934 152898ff2872f2bdf2123a52c37f6e64c18ab88a
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d36cf9029110268e8ae7f700f620823dcaab5d8e
Log:
Merge branch 'const_scalar_exprs' into PHP-5.6
Conflicts:
Zend/zend_extensions.h
Changed paths:
MM Zend/zend.h
MM Zend/zend_API.c
MM Zend/zend_compile.c
MM Zend/zend_compile.h
MM Zend/zend_operators.h
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM ext/opcache/zend_accelerator_util_funcs.c
Diff: