]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorRemi Collet <remi@php.net>
Fri, 14 Oct 2016 08:54:47 +0000 (10:54 +0200)
committerRemi Collet <remi@php.net>
Fri, 14 Oct 2016 08:54:47 +0000 (10:54 +0200)
commitaecd165b8f0efe0f3bbbf12c3f1e8710fbbc0458
tree074ff1f6e8ef455e17f612f64ff71014af74cf40
parent65e6f7e16f7f61d6c8bc1788a71f1cdc65fc9a9a
parent428ef5083819328b40357e1de229d5cf740a36e7
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  use zend_error instead of zend_error_noreturn