]> granicus.if.org Git - php/commitdiff
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)
* PHP-7.2:
  Fix macro redefinition warnings

1  2 
Zend/zend_config.w32.h

Simple merge