]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 17 Dec 2015 22:23:59 +0000 (23:23 +0100)
committerNikita Popov <nikic@php.net>
Thu, 17 Dec 2015 22:23:59 +0000 (23:23 +0100)
1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Simple merge
Simple merge