]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 17 Nov 2016 22:46:49 +0000 (23:46 +0100)
committerAnatol Belski <ab@php.net>
Thu, 17 Nov 2016 22:46:49 +0000 (23:46 +0100)
* PHP-7.0:
  add vc15 to the list

1  2 
win32/build/confutils.js

Simple merge