]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorBob Weinand <bobwei9@hotmail.com>
Wed, 17 Feb 2016 19:28:07 +0000 (20:28 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Wed, 17 Feb 2016 19:28:07 +0000 (20:28 +0100)
1  2 
sapi/phpdbg/phpdbg_prompt.c

Simple merge