com php-src: Merge branch 'phpng' into ast: Zend/zend.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_com pile.h Zend/zend_globals.h
Zend/zend_opcode.c Z end/zend_vm_def.h Zend/zend_vm_execute.h

From: Date: Tue, 22 Jul 2014 16:24:58 +0000
Subject: com php-src: Merge branch 'phpng' into ast: Zend/zend.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_com pile.h Zend/zend_globals.h
Zend/zend_opcode.c Z end/zend_vm_def.h Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80957@lists.php.net to get a copy of this message
Commit: d4d4b69e726473f07c11574a3d37cc7b7e65c625 Author: Nikita Popov <nikic@php.net> Tue, 22 Jul 2014 16:55:34 +0200 Parents: 43b2973ee75b7256dfce0dd18b725951aac6baf4 f163f625e804a5e9bd8fe19be4f8552671b2c12b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d4d4b69e726473f07c11574a3d37cc7b7e65c625 Log: Merge branch 'phpng' into ast Conflicts: Zend/zend_compile.c Zend/zend_compile.h Zend/zend_vm_def.h Zend/zend_vm_execute.h Some of dmitry's optimizations are not merged in yet! Changed paths: MM Zend/zend.c MM Zend/zend_ast.c MM Zend/zend_compile.c MM Zend/zend_compile.h MM Zend/zend_globals.h MM Zend/zend_opcode.c MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h Diff: <Diff exceeded maximum size>

« previous php.cvs (#80957) next »