]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 15 Jul 2019 14:26:25 +0000 (16:26 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 15 Jul 2019 14:26:25 +0000 (16:26 +0200)
1  2 
Zend/zend_compile.c
Zend/zend_globals.h
Zend/zend_language_scanner.l
main/main.c
sapi/cli/php_cli.c
sapi/phpdbg/phpdbg_prompt.c

Simple merge
Simple merge
Simple merge
diff --cc main/main.c
Simple merge
Simple merge
Simple merge