]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sun, 30 Oct 2016 14:30:17 +0000 (15:30 +0100)
committerAnatol Belski <ab@php.net>
Sun, 30 Oct 2016 14:30:17 +0000 (15:30 +0100)
* PHP-7.0:
  use rather the makefile var
  rename the env setting target and reuse it for build-snap

1  2 
win32/build/confutils.js

Simple merge