]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65e6f7e 428ef50)
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)
* PHP-7.0:
  use zend_error instead of zend_error_noreturn


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.