]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66f3fce a481291)
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 27 Oct 2016 20:36:00 +0000 (22:36 +0200)
committerAnatol Belski <ab@php.net>
Thu, 27 Oct 2016 20:36:00 +0000 (22:36 +0200)
* PHP-7.0:
  use rather the nmake var as it's evaluated on every run

1  2 
win32/build/confutils.js patch | diff1 | diff2 | blob | history

diff --cc win32/build/confutils.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.