granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c5727a3 53a08fd)

author	Remi Collet <remi@php.net>
	Wed, 1 Mar 2017 16:02:42 +0000 (17:02 +0100)
committer	Remi Collet <remi@php.net>
	Wed, 1 Mar 2017 16:02:42 +0000 (17:02 +0100)
commit	2f955d5d0a6708dd54cfcf4d53dad7f0efe93a2e
tree	0b928e3e3fd512f915d56f93a7d9f1ca386c9aa1	tree \| snapshot
parent	c5727a30cfdfec90af3614244216b9f1959f2125	commit \| diff
parent	53a08fd07d37062c8605202ab973f311d738c59a	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
make type consistent with glob_t.gl_pathc

ext/zip/php_zip.c

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