]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Fri, 18 Nov 2016 17:21:28 +0000 (18:21 +0100)
committerAnatol Belski <ab@php.net>
Fri, 18 Nov 2016 17:21:28 +0000 (18:21 +0100)
* PHP-7.0:
  don't fail miserably, when an unknown vc version is used

1  2 
win32/build/confutils.js

Simple merge