]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f097fb 915c428)
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Fri, 8 Nov 2013 12:37:28 +0000 (16:37 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 8 Nov 2013 12:37:28 +0000 (16:37 +0400)
* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
NEWS

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

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