]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 15 Nov 2017 22:01:52 +0000 (23:01 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 15 Nov 2017 22:01:52 +0000 (23:01 +0100)
1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Simple merge
Simple merge