]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorBob Weinand <bobwei9@hotmail.com>
Fri, 23 Sep 2016 01:29:56 +0000 (03:29 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Fri, 23 Sep 2016 01:29:56 +0000 (03:29 +0200)
1  2 
sapi/phpdbg/phpdbg_prompt.c

Simple merge