com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_ module.c
| From: | Dmitry Stogov | Date: | Fri, 21 Feb 2014 08:44:58 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_ module.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76162@lists.php.net to get a copy of this message | ||
Commit: 31f55150592e9316aafe93159a1a02cf215c1d67
Author: Dmitry Stogov <dmitry@zend.com> Fri, 21 Feb 2014 12:44:58 +0400
Parents: aebfc519eada3417be5ff9973682d291da99ce79 851f36288299ff3dc4f8ff6d0fd9e5f56211d583
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=31f55150592e9316aafe93159a1a02cf215c1d67
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Added information about interned strings usage
Conflicts:
NEWS
Changed paths:
MM ext/opcache/ZendAccelerator.c
MM ext/opcache/zend_accelerator_module.c
Diff: