]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Tue, 28 Jun 2016 18:57:55 +0000 (20:57 +0200)
committerNikita Popov <nikic@php.net>
Tue, 28 Jun 2016 18:57:55 +0000 (20:57 +0200)
commit45cfe7852a3364727d3a7e5425cb1567b02ea843
tree3c65b53459913503daa9957f0d96646378fa646e
parent2710ce22a0b4c7b618a84a42da49c73f704ef4f5
parentfafe01b07bfcb4f4a9088dd89195f2f5acba8fd0
Merge branch 'PHP-7.0'

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