]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Fri, 4 Nov 2016 17:44:14 +0000 (18:44 +0100)
committerAnatol Belski <ab@php.net>
Fri, 4 Nov 2016 17:44:14 +0000 (18:44 +0100)
* PHP-7.1:
  rename the tmp ini file, to keep it consistent with m4 variant

1  2 
win32/build/confutils.js

Simple merge