]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Fri, 20 Feb 2015 07:33:07 +0000 (10:33 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 20 Feb 2015 07:33:07 +0000 (10:33 +0300)
* PHP-5.6:
  Fixed type mismatch

1  2 
ext/opcache/zend_shared_alloc.h

Simple merge