]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Fri, 9 Aug 2013 13:52:22 +0000 (17:52 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 9 Aug 2013 13:52:22 +0000 (17:52 +0400)
commit2bc886abed2164fd30519b3016e3565d6069f71f
treeae5afa2548da8474789cf3792e743fd2826bc76f
parent7c3afd31f9a3357afc93c50223e2c4cfb1520f37
parentb27f6826d4d35caaf5b08e87297d13838930df94
Merge branch 'PHP-5.5'

* PHP-5.5:
  Replce ZEND_FETCH_* instructions with IS_CV if possible

Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
ext/opcache/Optimizer/pass1_5.c
ext/opcache/Optimizer/zend_optimizer.c