]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Sun, 14 Feb 2016 16:28:38 +0000 (17:28 +0100)
committerAnatol Belski <ab@php.net>
Sun, 14 Feb 2016 16:28:38 +0000 (17:28 +0100)
* PHP-7.0:
  cleanup duplicated var
  fix file lists with subdirs passed to EXTENSION()

1  2 
win32/build/confutils.js

Simple merge