]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Mon, 18 Apr 2016 11:14:30 +0000 (19:14 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 18 Apr 2016 11:14:30 +0000 (19:14 +0800)
* PHP-7.0:
  combine conditions

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

Simple merge
Simple merge