]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Wed, 23 Jul 2014 21:16:28 +0000 (01:16 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 23 Jul 2014 21:16:28 +0000 (01:16 +0400)
* PHP-5.6:
  Removed second zval_copy_ctor()

1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Simple merge
Simple merge