diff options
| author | Will Fitch <willfitch@php.net> | 2014-01-18 11:39:32 -0500 |
|---|---|---|
| committer | Will Fitch <willfitch@php.net> | 2014-01-18 11:39:32 -0500 |
| commit | 767e6d2e08afad2ac5e019b08a8875ffd2496206 (patch) | |
| tree | f9f404591e3c419f000b084ed5f7a5aa92ad2427 /sapi/phpdbg/phpdbg_cmd.c | |
| parent | 7f0aff52cf35db89c1285ddb931fc118e1127561 (diff) | |
| parent | 5b906ce6eb02118697c2f81d462ddfa724377fe8 (diff) | |
| download | php-git-767e6d2e08afad2ac5e019b08a8875ffd2496206.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #66509: copy() arginfo incorrect since 5.4
Conflicts:
NEWS
Diffstat (limited to 'sapi/phpdbg/phpdbg_cmd.c')
0 files changed, 0 insertions, 0 deletions