granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7ebf290 1f977d2)

author	Anatol Belski <ab@php.net>
	Thu, 31 Aug 2017 18:34:03 +0000 (20:34 +0200)
committer	Anatol Belski <ab@php.net>
	Thu, 31 Aug 2017 18:34:03 +0000 (20:34 +0200)
commit	e7c1c86ceb8e8580ed3f4f171357e43b14d95c7b
tree	00af2e32d39f45316d1ca1184a708e1ced9e3e7e	tree \| snapshot
parent	7ebf2902e7a387915d936b7eaf0b75c3295a0518	commit \| diff
parent	1f977d2377d47aca02b6bdd946e53f14f5d7c7fe	commit \| diff

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fix `nmake install` fails when there are no shared extensions

win32/build/Makefile

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