]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Sat, 3 Sep 2016 21:31:05 +0000 (23:31 +0200)
committerNikita Popov <nikic@php.net>
Sat, 3 Sep 2016 21:31:05 +0000 (23:31 +0200)
1  2 
sapi/phpdbg/phpdbg_prompt.c

Simple merge