]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 14 Jul 2016 16:39:48 +0000 (18:39 +0200)
committerNikita Popov <nikic@php.net>
Thu, 14 Jul 2016 16:39:48 +0000 (18:39 +0200)
commit0bda0422af0a9a920135bf3d7b7b4784eb0df802
tree53c9577143b24f034fb560c97f904077c2f63ba1
parent5aaffb79084ba929675a7e8543f91ff324439939
parent411eee7b5ae8b529b10184f98e3f9b02d93ba864
Merge branch 'PHP-7.0'

Conflicts:
Zend/zend_vm_execute.h
Zend/zend_API.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c