]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Tue, 31 Oct 2017 09:38:18 +0000 (10:38 +0100)
committerAnatol Belski <ab@php.net>
Tue, 31 Oct 2017 09:38:18 +0000 (10:38 +0100)
commitda9da5742cee401ef2861ddc1bdecbe706caa076
treeb1cb4b01f34359e7244f06a763e832eba15454a8
parente3b2859c8a1062e6bd87237f59a4004197912148
parent98422cfa3df722b3b65dac9540874d9ba7bf6d82
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix year
  Add /nologo
win32/build/Makefile
win32/build/confutils.js