]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Thu, 10 Oct 2013 11:33:17 +0000 (15:33 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 10 Oct 2013 11:33:17 +0000 (15:33 +0400)
commita2aa6a34409e7e8f8dd568151b9b8bf91c7bc888
tree52c6573d7b48b90c5228cbe0e6688077050a0e52
parent141c2cb97aa1ce682d97704249ec23067bd1b89a
parentef8cf76815e10db08d07897296c09b925a1511a1
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).

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