diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-07-30 17:36:47 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-07-30 17:36:47 +0400 |
| commit | 0aa342e903bf012efe03db1e9f1fe4ed54225e76 (patch) | |
| tree | cce04f954a5e376795deae2c093449ed6fb47891 /TSRM/tsrm_strtok_r.c | |
| parent | 5e1ac558c3354f98a9a5aecb5b518c46cd55357a (diff) | |
| parent | 3550f3d0aad6e979e2a6fe3ee40d4fbff168c34b (diff) | |
| download | php-git-0aa342e903bf012efe03db1e9f1fe4ed54225e76.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Conflicts:
NEWS
Diffstat (limited to 'TSRM/tsrm_strtok_r.c')
0 files changed, 0 insertions, 0 deletions