]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Fri, 1 Dec 2017 15:03:09 +0000 (16:03 +0100)
committerAnatol Belski <ab@php.net>
Fri, 1 Dec 2017 15:03:09 +0000 (16:03 +0100)
commitf282b7720ab3f23966fd39eabd3e7716c0e62a1a
treeee0f11d0388a04ff95f37381cf8b86923a9bd561
parent01b85f0e1773c540b978520cc8c7449425aca02b
parentffd94f9bf82730ea28b54b51661fef97b8f2b3b6
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Consider Xdebug for tmi ini generation, too
win32/build/confutils.js