]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Tue, 1 Mar 2016 08:36:36 +0000 (09:36 +0100)
committerAnatol Belski <ab@php.net>
Tue, 1 Mar 2016 08:36:36 +0000 (09:36 +0100)
* PHP-7.0:
  extend check for add_flag

1  2 
win32/build/confutils.js

Simple merge