com php-src: Merge remote-tracking branch 'php-src/master' into ast: Zend/zend.c Zend/zend.h Zend/zend_ast.c Zend/zend_ast .h Zend/zend_compile.c
Zend/zend_compile.h Zend /zend_execute_API.c Zend/zend_globals.h Zend/zend _language_parser.y Zend/zend_language_scanner.c
Zend/zend_language_scanner.l Zend/zend_opcode.c Zend/zend_types.h Zend/zend_variables.c Zend/zen d_vm_def.h Zend/zend_vm_execute.h ext/opcache/O
ptimizer/pass1_5.c ext/opcache/zend_accel
| From: | Nikita Popov | Date: | Mon, 25 Aug 2014 19:52:18 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'php-src/master' into ast: Zend/zend.c Zend/zend.h Zend/zend_ast.c Zend/zend_ast .h Zend/zend_compile.c Zend/zend_compile.h Zend /zend_execute_API.c Zend/zend_globals.h Zend/zend _language_parser.y Zend/zend_language_scanner.c Zend/zend_language_scanner.l Zend/zend_opcode.c Zend/zend_types.h Zend/zend_variables.c Zend/zen d_vm_def.h Zend/zend_vm_execute.h ext/opcache/O ptimizer/pass1_5.c ext/opcache/zend_accel |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80856@lists.php.net to get a copy of this message | ||
Commit: 6db293d5e043d35c281a6b11cb68460f5d7188a9
Author: Nikita Popov <nikic@php.net> Mon, 25 Aug 2014 21:21:16 +0200
Parents: 7813d85d3d5901b24f77b63538eb6754e161f471 455741fce3c4f4392deb97775cba7a39f6490271
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6db293d5e043d35c281a6b11cb68460f5d7188a9
Log:
Merge remote-tracking branch 'php-src/master' into ast
Conflicts:
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_globals.h
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_types.h
Changed paths:
MM Zend/zend.c
MM Zend/zend.h
MM Zend/zend_ast.c
MM Zend/zend_ast.h
MM Zend/zend_compile.c
MM Zend/zend_compile.h
MM Zend/zend_execute_API.c
MM Zend/zend_globals.h
MM Zend/zend_language_parser.y
MM Zend/zend_language_scanner.c
MM Zend/zend_language_scanner..l
MM Zend/zend_opcode.c
MM Zend/zend_types.h
MM Zend/zend_variables.c
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
MM ext/opcache/zend_persist.c
MM ext/opcache/zend_persist_calc.c
Diff: <Diff exceeded maximum size>