diff options
| author | Matteo Beccati <mbeccati@php.net> | 2014-10-29 11:32:12 +0100 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2014-10-29 11:32:12 +0100 |
| commit | eb4e4b7bca733982e96e58353256f27b3ebe7328 (patch) | |
| tree | 8306f643b23485abf89edabc590475e95534ac56 /sapi/phpdbg/phpdbg_rinit_hook.c | |
| parent | 7dd871438fec9eaccf06c235faba1f51ff2967da (diff) | |
| parent | daf9357d272c810718aceae57e6e77cdc62e1be8 (diff) | |
| download | php-git-eb4e4b7bca733982e96e58353256f27b3ebe7328.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed test to work with recent libcurl versions
PHP 5.5.20 now
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/phpdbg/phpdbg_rinit_hook.c')
0 files changed, 0 insertions, 0 deletions