]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Thu, 30 Nov 2017 11:41:44 +0000 (12:41 +0100)
committerAnatol Belski <ab@php.net>
Thu, 30 Nov 2017 11:41:44 +0000 (12:41 +0100)
commita415006b5e9735dc9e731816ca0ef18e26402fdf
tree1ff3b7846a6395efd57a120141a4abc2c9b2af22
parent7067f7ccb40010275c7020949753b412025e3024
parent23d2bd374838897ec97f9994e70856686a89f132
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix macro redefinition warnings
Zend/zend_config.w32.h