]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Wed, 31 Aug 2016 10:11:19 +0000 (12:11 +0200)
committerAnatol Belski <ab@php.net>
Wed, 31 Aug 2016 10:11:19 +0000 (12:11 +0200)
* PHP-7.1:
  add more defs for resource alloc/dealloc
  add yet one define

1  2 
win32/build/confutils.js

Simple merge