com php-src: Merge branch 'master' of https://github.com/php/php-src into typed-properties: Zend/zend.c Zend/zend_compile.c Zend/ze nd_compile.h
Zend/zend_execute.c Zend/zend_execut e.h Zend/zend_opcode.c Zend/zend_vm_def.h Zen d/zend_vm_execute.h Zend/zend_vm_gen.php Zend/z end_vm_opcodes.c
Zend/zend_vm_opcodes.h ext/opc ache/Optimizer/zend_dump.c ext/opcache/Optimizer/zend_o ptimizer.c
| From: | Bob Weinand | Date: | Tue, 07 Jun 2016 05:48:45 +0000 |
| Subject: | com php-src: Merge branch 'master' of https://github.com/php/php-src into typed-properties: Zend/zend.c Zend/zend_compile.c Zend/ze nd_compile.h Zend/zend_execute.c Zend/zend_execut e.h Zend/zend_opcode.c Zend/zend_vm_def.h Zen d/zend_vm_execute.h Zend/zend_vm_gen.php Zend/z end_vm_opcodes.c Zend/zend_vm_opcodes.h ext/opc ache/Optimizer/zend_dump.c ext/opcache/Optimizer/zend_o ptimizer.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95495@lists.php.net to get a copy of this message | ||
Commit: 3bbe52d3a690b3dbb064a67f8bd0307f00559036
Author: Joe Watkins <krakjoe@php.net> Tue, 7 Jun 2016 06:48:45 +0100
Parents: cc19dc51dc83b184b580da6a3421b8fbaa0022ba 214d4613f523ac12a1fb5f06a9b3e98a47ed6e49
Branches: typed_ref_properties
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3bbe52d3a690b3dbb064a67f8bd0307f00559036
Log:
Merge branch 'master' of https://github.com/php/php-src into typed-properties
Conflicts:
Zend/zend_vm_gen.php
Changed paths:
MM Zend/zend.c
MM Zend/zend_compile.c
MM Zend/zend_compile.h
MM Zend/zend_execute.c
MM Zend/zend_execute.h
MM Zend/zend_opcode.c
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM Zend/zend_vm_gen.php
MM Zend/zend_vm_opcodes.c
MM Zend/zend_vm_opcodes.h
MM ext/opcache/Optimizer/zend_dump.c
MM ext/opcache/Optimizer/zend_optimizer.c
Diff: