]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d73af63 cf4f168)
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Fri, 4 Nov 2016 17:43:56 +0000 (18:43 +0100)
committerAnatol Belski <ab@php.net>
Fri, 4 Nov 2016 17:43:56 +0000 (18:43 +0100)
* PHP-7.0:
  rename the tmp ini file, to keep it consistent with m4 variant

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.