]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 546af19 fd521a2)
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 7 Feb 2017 11:03:21 +0000 (12:03 +0100)
committerAnatol Belski <ab@php.net>
Tue, 7 Feb 2017 11:03:21 +0000 (12:03 +0100)
* PHP-7.0:
  switch to smart str conversion routine to hide exact NAN type

1  2 
Zend/zend_exceptions.c patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_exceptions.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.