]> granicus.if.org Git - php/commit
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)
commita4a767e6da477ae84e1c7e442fef64f99a4dbbc4
treeeec77f7884004a40474c0e72ad5e8463d2bb79ab
parenta79a504b6da0f1a9420f4611e2a23f46f348f722
parent2f2653aa7758cd586f1daff288146740dd5fa61b
Merge branch 'PHP-7.0'

Conflicts:
Zend/zend_vm_execute.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h