]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 10 Oct 2017 10:59:14 +0000 (12:59 +0200)
committerAnatol Belski <ab@php.net>
Tue, 10 Oct 2017 10:59:14 +0000 (12:59 +0200)
* PHP-7.0:
  Fix re2c version detection

1  2 
win32/build/confutils.js

Simple merge