]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcf27a1 884bbcd)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Fri, 21 Feb 2014 08:00:33 +0000 (12:00 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 21 Feb 2014 08:00:33 +0000 (12:00 +0400)
* PHP-5.5:
  Added function opcache_is_script_cached(). (Danack)

Conflicts:
NEWS

1  2 
ext/opcache/zend_accelerator_module.c patch | diff1 | diff2 | blob | history

diff --cc ext/opcache/zend_accelerator_module.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.