granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b7dd867 99aa548)

author	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 10 Jul 2020 11:42:13 +0000 (13:42 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 10 Jul 2020 11:42:13 +0000 (13:42 +0200)
commit	9a5695bfc30103a306a1b0677c526a44b3db100c
tree	cec107f8a015f6121e333e88c9707dd547b31548	tree \| snapshot
parent	b7dd8679df0d221682aa4d37a9b10f4ae01c1349	commit \| diff
parent	99aa5484e2c5ba73e32cef50ae54495f8dab4023	commit \| diff

Merge branch 'PHP-7.4'

* PHP-7.4:
Enable further ext/standard/tests/file tests on Windows

ext/standard/tests/file/fileinode_variation.phpt	diff1 \|	diff2 \|	blob \| history
ext/standard/tests/file/fopen_variation10-win32.phpt	diff1 \|	diff2 \|	blob \| history
ext/standard/tests/file/fopen_variation11-win32.phpt	diff1 \|	diff2 \|	blob \| history

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