]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Mon, 26 Mar 2018 11:38:55 +0000 (13:38 +0200)
committerAnatol Belski <ab@php.net>
Mon, 26 Mar 2018 11:38:55 +0000 (13:38 +0200)
commit35f832a007d3db82a7f65fcad19e5b21ab9bcc7b
tree675a44459ca17e3fe210776165413690b3c13daa
parent86aecd8801985d1cc41ddf947a3b5bcc42989b80
parent5b2c30d7e6d7eced31f5c6ef2bec0d56027f460e
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix phpize build when DEFINE() is involved
win32/build/confutils.js