diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-19 17:55:26 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-19 17:55:26 -0700 |
| commit | 33ff44199676d72948a6a3b03f6017ba799b09f8 (patch) | |
| tree | b51c6efca73639e6fa9f02e42b385a272fcb2aa2 /ext/intl/breakiterator/codepointiterator_methods.cpp | |
| parent | ca57ce5132fc304e2564cc7d5e4475ddb1a73bf4 (diff) | |
| parent | 4ee1ec4bcfee93a3d9bdc2abf195bf5b29dcea73 (diff) | |
| download | php-git-33ff44199676d72948a6a3b03f6017ba799b09f8.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Update NEWS
fix bug #65481 (shutdown segfault due to serialize)
Track created curl_slist structs by option so they can be updated in situ.
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Diffstat (limited to 'ext/intl/breakiterator/codepointiterator_methods.cpp')
0 files changed, 0 insertions, 0 deletions