]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 29 Sep 2016 11:02:03 +0000 (13:02 +0200)
committerAnatol Belski <ab@php.net>
Thu, 29 Sep 2016 11:02:03 +0000 (13:02 +0200)
commit38283232907c5dcf22f521607001ba9dbb46db75
treece1ce6e2c4e1b8b2feba0f0fa3878ef54d301d7b
parent53c0a041856974b7d9f5444c477cea7d0e994b5c
parent62bed405da99806aa94991ef0b933a1c41878aa5
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  sync win32 makefile with makedist zendparse exports
win32/build/confutils.js