diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-03-05 14:11:35 -0700 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-03-05 14:11:35 -0700 |
| commit | 39501bed3b8883d056834a3bb4de8ee66675889f (patch) | |
| tree | a64ac397a44e7c171866ef9477484ea86822ee36 /main/php_streams.h | |
| parent | db1a668d629a17a004709ce4b67125451d117d9a (diff) | |
| parent | ca24d19a895e7b8047db7f43acb041ad288a578f (diff) | |
| download | php-git-39501bed3b8883d056834a3bb4de8ee66675889f.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Really fix zts this time
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'main/php_streams.h')
0 files changed, 0 insertions, 0 deletions