granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6c53fe3 5b9d716)

author	Anatol Belski <ab@php.net>
	Fri, 18 Nov 2016 17:21:28 +0000 (18:21 +0100)
committer	Anatol Belski <ab@php.net>
	Fri, 18 Nov 2016 17:21:28 +0000 (18:21 +0100)
commit	828f866e47808749e1033a76d99fa6ecb2d87a65
tree	071dc40f9fdedcaf1bfeda48680cb7d3cc7affb5	tree \| snapshot
parent	6c53fe3413c3065430efee7f8ab97db3e1e86a73	commit \| diff
parent	5b9d7160c519a6d49a9d703a20c9c6104cd3b0bf	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
don't fail miserably, when an unknown vc version is used

win32/build/confutils.js

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