]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 10 Dec 2015 17:24:29 +0000 (18:24 +0100)
committerNikita Popov <nikic@php.net>
Thu, 10 Dec 2015 17:24:29 +0000 (18:24 +0100)
commit3d4a2d200214c08db23dcff172eb5e48cee5044a
treeb7a2996b54ad9cf061c44d03b392f2767f78fe75
parent6f966fad0d4c70539aa6a47264061d03f2c7fd12
parent798d168d73985624cfb50e9a86acce7f3446d6fb
Merge branch 'PHP-7.0'

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_compile.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/opcache/Optimizer/zend_optimizer.c