diff options
| author | Michael Wallner <mike@php.net> | 2014-04-30 09:28:21 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2014-04-30 09:28:21 +0200 |
| commit | 407612083f0d71decbd3ca2e6a610d4824957364 (patch) | |
| tree | 8515f66ce8f888e2a579d395d52aed42366f389e /sapi/phpdbg/phpdbg_frame.h | |
| parent | 98fcee48f9b9e3d2ca3472a4e907565e0eccb7a5 (diff) | |
| parent | 54fee59598082052395f4011931096babd6f4013 (diff) | |
| download | php-git-407612083f0d71decbd3ca2e6a610d4824957364.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
Diffstat (limited to 'sapi/phpdbg/phpdbg_frame.h')
0 files changed, 0 insertions, 0 deletions