]> granicus.if.org Git - php/commitdiff
Merge ../phpdbg into PHP-5.6
authorBob Weinand <bobwei9@hotmail.com>
Tue, 28 Oct 2014 21:15:05 +0000 (22:15 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Tue, 28 Oct 2014 21:15:05 +0000 (22:15 +0100)
Conflicts:
sapi/phpdbg/config.m4

1  2 
sapi/phpdbg/config.m4
sapi/phpdbg/config.w32
sapi/phpdbg/phpdbg_wait.c
sapi/phpdbg/phpdbg_webdata_transfer.c

Simple merge
Simple merge
Simple merge
Simple merge