granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5fa9a6d 3f12d85)

author	Anatol Belski <ab@php.net>
	Thu, 27 Oct 2016 20:36:28 +0000 (22:36 +0200)
committer	Anatol Belski <ab@php.net>
	Thu, 27 Oct 2016 20:36:28 +0000 (22:36 +0200)
commit	c62d90650ad6e9ff41c4674a8a901b88947ef65b
tree	3c31aa90186d1cd3744b9882678c9b69871fef3f	tree \| snapshot
parent	5fa9a6d17627e771b3df5378c621cbed6b2303b3	commit \| diff
parent	3f12d852ecda34caedebad0357e045d4d0774c16	commit \| diff

Merge branch 'PHP-7.1'

* PHP-7.1:
use rather the nmake var as it's evaluated on every run

win32/build/confutils.js

Unnamed repository; edit this file 'description' to name the repository.