]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorDmitry Stogov <dmitry@zend.com>
Tue, 22 Dec 2015 18:32:45 +0000 (21:32 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 22 Dec 2015 18:32:45 +0000 (21:32 +0300)
commitf3bf95eb81a43e9e77277f5548687cdcc767a7ee
tree8b21953069e74e9a9333ebba791d666efecd7a0d
parent3e3d0290ff245393c0f0eda9146a685c8a9fad3d
parenta57a08e79133aa37372c9c997e17f63e479e792d
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed incorrect setting on 32-bit systems
ext/opcache/Optimizer/zend_optimizer.h