]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 9 Jun 2014 02:18:09 +0000 (19:18 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 9 Jun 2014 02:18:09 +0000 (19:18 -0700)
commit9fceb05fcf7218098b84cf825628e72e95097b02
tree1da089a8d1de0f8ae4e129819a8171df96b2a674
parent659eeee1643a8d021a7725a6f717ef52573f95d6
parentcfccdc63628944cde2c9fe9bfbc897cce3e22dc5
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug 64744 Show the type of the non-object for more descriptive errors
Zend/zend_vm_def.h
Zend/zend_vm_execute.h