diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-10-15 19:42:51 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-10-15 19:42:51 +0200 |
| commit | cfa1028d7e3942d6921d2c3ba5fba1be3ea78400 (patch) | |
| tree | 707c5780b8d301f615e9ce55efe7c60ed5663741 /sapi/phpdbg/phpdbg_parser.c | |
| parent | 2109f5bfe362fdfe840a7014bd62682de3d95c5c (diff) | |
| parent | 503f8193e804ba1eb0847b4c6148844e50a60427 (diff) | |
| download | php-git-cfa1028d7e3942d6921d2c3ba5fba1be3ea78400.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed Bug #65171 imagescale() fails
Revert "Bug #41631: Observe socket read timeouts in SSL streams"
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.c')
0 files changed, 0 insertions, 0 deletions