]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 29 Oct 2016 00:12:05 +0000 (02:12 +0200)
committerAnatol Belski <ab@php.net>
Sat, 29 Oct 2016 00:12:05 +0000 (02:12 +0200)
commit3f35078857df0474daba0812307576b2b47e6922
treee31ed03a5af8c02168dcc6790a6c0ce489b6ffd0
parent103f6330929e4c4dfcc371149786b7d812b8d7e0
parent5b04a2187e2b12325b26e289df7f73e03cc4cda2
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  generate test ini file, so shared exts are loaded for nmake test
  additional env is generated for phpize, too
win32/build/config.w32
win32/build/confutils.js