]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Wed, 6 Apr 2016 11:50:24 +0000 (13:50 +0200)
committerAnatol Belski <ab@php.net>
Wed, 6 Apr 2016 11:50:24 +0000 (13:50 +0200)
* PHP-7.0:
  make opcache lockfile path configurable

1  2 
ext/opcache/ZendAccelerator.h
ext/opcache/zend_accelerator_module.c

Simple merge
Simple merge