]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Wed, 8 Oct 2014 17:54:05 +0000 (21:54 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 8 Oct 2014 17:54:05 +0000 (21:54 +0400)
* PHP-5.6:
  Added info about ext/opcache

Conflicts:
EXTENSIONS

1  2 
EXTENSIONS

diff --cc EXTENSIONS
index 757a1a8fd6bfdf3236efd6b27b235ea15d3ae310,fd454dfc541bdae6359d0fba3e381d91eb00497c..00a78ec16390475b555251fab9d7cf2411eb2cbf
@@@ -421,6 -428,28 +421,12 @@@ PRIMARY MAINTAINER:  Derick Rethans <de
  MAINTENANCE:         Maintained
  STATUS:              Working
  -------------------------------------------------------------------------------
 -EXTENSION:           mhash
 -PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>, Scott MacVicar <scottmac@php.net>
 -MAINTENANCE:         Unknown
 -STATUS:              Working
 --------------------------------------------------------------------------------
 -EXTENSION:           mime_magic
 -PRIMARY MAINTAINER:  Unknown
 -MAINTENANCE:         Deprecated
 -STATUS:              Experimental
 -COMMENT:             Use the fileinfo extension instead
 --------------------------------------------------------------------------------
 -EXTENSION:           ming
 -PRIMARY MAINTAINER:  Frank M. Kromann
 -MAINTENANCE:         Unknown
 -STATUS:              Experimental
 --------------------------------------------------------------------------------
+ EXTENSION:           opcache
+ PRIMARY MAINTAINER:  Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net>
+ MAINTENANCE:         Maintained
+ STATUS:              Working
+ SINCE:               5.5.0
+ -------------------------------------------------------------------------------
  EXTENSION:           openssl
  PRIMARY MAINTAINER:  Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>
  MAINTENANCE:         Maintained