com php-src: Merge branch 'ast': Zend/zend.h Zend/zend_compil e.c Zend/zend_compile.h Zend/zend_language_scanne r.c Zend/zend_language_scanner.l
Zend/zend_operat ors.h Zend/zend_vm_def.h Zend/zend_vm_execute .h ext/opcache/Optimizer/pass1_5.c ext/opcache/ze nd_accelerator_util_funcs.c
| From: | Nikita Popov | Date: | Mon, 25 Aug 2014 20:04:33 +0000 |
| Subject: | com php-src: Merge branch 'ast': Zend/zend.h Zend/zend_compil e.c Zend/zend_compile.h Zend/zend_language_scanne r.c Zend/zend_language_scanner.l Zend/zend_operat ors.h Zend/zend_vm_def.h Zend/zend_vm_execute .h ext/opcache/Optimizer/pass1_5.c ext/opcache/ze nd_accelerator_util_funcs.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80858@lists.php.net to get a copy of this message | ||
Commit: 899a1ed59a2f7133367dc39f95b143c019822520
Author: Nikita Popov <nikic@php.net> Mon, 25 Aug 2014 21:59:30 +0200
Parents: af59e92b24c8f624672720d47ef65bd8457728b9 6db293d5e043d35c281a6b11cb68460f5d7188a9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=899a1ed59a2f7133367dc39f95b143c019822520
Log:
Merge branch 'ast'
Conflicts:
Zend/zend_compile.c
Changed paths:
MM Zend/zend.h
MM Zend/zend_compile.c
MM Zend/zend_compile.h
MM Zend/zend_language_scanner.c
MM Zend/zend_language_scanner.l
MM Zend/zend_operators.h
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM ext/opcache/Optimizer/pass1_5.c
MM ext/opcache/zend_accelerator_util_funcs.c
Diff: <Diff exceeded maximum size>