granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1dab39b 2b7e546)

author	Anatol Belski <ab@php.net>
	Mon, 30 Jan 2017 00:57:27 +0000 (01:57 +0100)
committer	Anatol Belski <ab@php.net>
	Mon, 30 Jan 2017 00:57:27 +0000 (01:57 +0100)
commit	2a5a3104462ad9d46be9d74fa85be26793870ce6
tree	a1215608e8c9197058cfcaf4d1afe99c0f8af4cb	tree \| snapshot
parent	1dab39b9aa0934e01d8ad1e91d0db3bbd20a1dbd	commit \| diff
parent	2b7e5468c9ace40fc96a3345d14af177cabcf613	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
fix system id initialization for multiple threads

ext/opcache/ZendAccelerator.c

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