]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Sat, 2 Jan 2016 09:56:54 +0000 (17:56 +0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 2 Jan 2016 09:56:54 +0000 (17:56 +0800)
32 files changed:
1  2 
Zend/zend.c
Zend/zend.h
Zend/zend_API.c
Zend/zend_API.h
Zend/zend_ast.h
Zend/zend_builtin_functions.c
Zend/zend_closures.c
Zend/zend_closures.h
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_constants.h
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_extensions.h
Zend/zend_inheritance.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_opcode.c
Zend/zend_smart_str.c
Zend/zend_smart_str.h
Zend/zend_types.h
Zend/zend_variables.c
Zend/zend_variables.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_gen.php
Zend/zend_vm_opcodes.c
Zend/zend_vm_opcodes.h
ext/opcache/ZendAccelerator.c

diff --cc Zend/zend.c
Simple merge
diff --cc Zend/zend.h
Simple merge
diff --cc Zend/zend_API.c
Simple merge
diff --cc Zend/zend_API.h
Simple merge
diff --cc Zend/zend_ast.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge