]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorBob Weinand <bobwei9@hotmail.com>
Sun, 20 Nov 2016 18:20:09 +0000 (19:20 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Sun, 20 Nov 2016 18:20:09 +0000 (19:20 +0100)
commit110a6cc6c04b95ce9fcde8611e10c40ea07e3d7d
treef35324e4de6ed82a5f022644a964c86c3b8eb7a2
parentc58378619b34b1a15fbbf5500095d9ca99e59e90
parentbc30206b8ad4975126bd36f48add769d0d9a221a
Merge branch 'PHP-7.0' into PHP-7.1
Zend/zend_portability.h
sapi/fpm/fpm/fpm_log.c
sapi/fpm/fpm/fpm_main.c
sapi/fpm/fpm/fpm_signals.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg.h