]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cba1a84 04e3d82)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 10 Dec 2015 21:48:20 +0000 (00:48 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 10 Dec 2015 21:48:20 +0000 (00:48 +0300)
* 'master' of git.php.net:php-src:
  Make duplicate class constant error for internal class
  Make ZEND_CLONE return a TMP_VAR

1  2 
Zend/zend_vm_def.h patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_vm_def.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.