]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Mon, 29 Feb 2016 13:48:28 +0000 (14:48 +0100)
committerAnatol Belski <ab@php.net>
Mon, 29 Feb 2016 13:48:28 +0000 (14:48 +0100)
* PHP-7.0:
  fix nmake clean in phpize mode

1  2 
win32/build/confutils.js

Simple merge