]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Wed, 4 Nov 2015 01:56:05 +0000 (17:56 -0800)
committerXinchen Hui <laruence@gmail.com>
Wed, 4 Nov 2015 01:56:05 +0000 (17:56 -0800)
Conflicts:
Zend/zend_vm_execute.h

1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Simple merge
Simple merge