]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4e6a0bd 915c428)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Fri, 8 Nov 2013 12:36:31 +0000 (16:36 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 8 Nov 2013 12:36:31 +0000 (16:36 +0400)
commit0e5c5072e698438ee9857979cf8418805865518a
tree7bef2b50d8e0a6482e435a707c7f087f665dca84tree | snapshot
parent4e6a0bd5a996fc36282eb4666488a9ef1d0d7d5acommit | diff
parent915c428ba1006a144c4fca45e44631ec058a5074commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
NEWS
ext/opcache/ZendAccelerator.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.