]> granicus.if.org Git - php/commit
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)
commit4bc7a91be71f833672cc52134e665ce0b08bd61c
tree2ca6ac0174e34b3377716f0f87fc024c21d7193e
parent36fef6dcd9d9e95127726fcfb231303ca59749b9
Merge ../phpdbg into PHP-5.6

Conflicts:
sapi/phpdbg/config.m4
config.m4
config.w32
phpdbg_wait.c
phpdbg_webdata_transfer.c