]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorXinchen Hui <laruence@gmail.com>
Tue, 2 Aug 2016 09:40:47 +0000 (17:40 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 2 Aug 2016 09:40:47 +0000 (17:40 +0800)
* PHP-7.1:
  Optimized array_merge
  prepare next
  fix php_version.h

1  2 
ext/standard/array.c

Simple merge