]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Sat, 16 Apr 2016 20:34:32 +0000 (22:34 +0200)
committerNikita Popov <nikic@php.net>
Sat, 16 Apr 2016 20:34:32 +0000 (22:34 +0200)
1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Simple merge
Simple merge