granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5a1ffef 025899e)

author	Joe Watkins <krakjoe@php.net>
	Wed, 19 Jun 2019 07:00:00 +0000 (09:00 +0200)
committer	Joe Watkins <krakjoe@php.net>
	Wed, 19 Jun 2019 07:01:20 +0000 (09:01 +0200)
commit	fb95043acf19b1f3784c9131a7b77df78bf4acec
tree	11fddb58412b404ec70e5329e47039c60fd48c7b	tree \| snapshot
parent	5a1ffefbc19cdb6cd7f9b29f620e621295ccb446	commit \| diff
parent	025899e3b53e47cae9c1da4077988577b57e4b15	commit \| diff

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044

NEWS	diff1 \|	diff2 \|	blob \| history
ext/date/php_date.c	diff1 \|	diff2 \|	blob \| history
ext/date/php_date.h	diff1 \|	diff2 \|	blob \| history

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