]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 13 Oct 2016 13:25:25 +0000 (15:25 +0200)
committerAnatol Belski <ab@php.net>
Thu, 13 Oct 2016 13:25:25 +0000 (15:25 +0200)
* PHP-7.0:
  rename publicly exposed symbol to avoid name conflicts

1  2 
Zend/zend_multiply.h
ext/pcre/php_pcre.c

Simple merge
Simple merge