]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Fri, 1 Dec 2017 15:02:38 +0000 (16:02 +0100)
committerAnatol Belski <ab@php.net>
Fri, 1 Dec 2017 15:02:38 +0000 (16:02 +0100)
* PHP-7.0:
  Consider Xdebug for tmi ini generation, too

1  2 
win32/build/confutils.js

Simple merge