diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-12-26 11:52:39 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-12-26 11:52:39 +0400 |
| commit | 0ff0e82f26fcae352007c08873ab408c12948ad9 (patch) | |
| tree | 6b29aad8822f2f4e693eea3ff7f5f5dc0a435d76 /Zend/zend_string.c | |
| parent | 1e411ebdf5fa56fa8f8870d22a5bdd21c54caf69 (diff) | |
| parent | 6414fe283e3931d87416a155f4cfbaaf5ffca1ad (diff) | |
| download | php-git-0ff0e82f26fcae352007c08873ab408c12948ad9.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed ZEND_MM_MEM_TYPE=mmap_zero
Conflicts:
NEWS
Diffstat (limited to 'Zend/zend_string.c')
0 files changed, 0 insertions, 0 deletions