diff options
author | Anatol Belski <ab@php.net> | 2014-01-22 12:04:25 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-01-22 12:04:25 +0100 |
commit | 6d1d8ec3308437d7e5dc3900cea1ee26bf76406c (patch) | |
tree | bebbc0e52fabc32674e7df6b5b87622ed0f929cc /main/php_streams.h | |
parent | e67ef24227d3fbd4a3ef0a44ada03fea2a6f5263 (diff) | |
parent | 34792280bcd2210784ba574d52fc3619cc06160d (diff) | |
download | php-git-6d1d8ec3308437d7e5dc3900cea1ee26bf76406c.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix zts
Diffstat (limited to 'main/php_streams.h')
0 files changed, 0 insertions, 0 deletions