]> granicus.if.org Git - php/commit
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)
commitb5d01ab5a1d3021376d8f01f9083d37356c190dd
tree5f2a369093d0583c7c28248e7c59298083f555f8
parent4975c39e086db1eb8d90e44d26acb642e1fd27b1
parentaa9f8e695c1babf4be4aa27328f02608fbcf9033
Merge branch 'PHP-7.0'

* PHP-7.0:
  combine conditions
Zend/zend_vm_def.h
Zend/zend_vm_execute.h