granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5097812 6165c23)

author	Nikita Popov <nikita.ppv@gmail.com>
	Thu, 20 Jun 2019 14:24:31 +0000 (16:24 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Thu, 20 Jun 2019 14:24:31 +0000 (16:24 +0200)
commit	6aaab9adf7619c121c19701022aeb8d88f9c3bab
tree	531c292fdae6364f73f141759788a626888238d8	tree \| snapshot
parent	50978128f50eb5fa5920aea8a19a5855059a87c7	commit \| diff
parent	6165c23475d5020cda3794cb684693a7fab9918d	commit \| diff

Merge branch 'PHP-7.4'

Zend/zend_execute.c	diff1 \|	diff2 \|	blob \| history
Zend/zend_execute_API.c	diff1 \|	diff2 \|	blob \| history
Zend/zend_globals.h	diff1 \|	diff2 \|	blob \| history
Zend/zend_operators.c	diff1 \|	diff2 \|	blob \| history
Zend/zend_operators.h	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
ext/ffi/ffi.c	diff1 \|	diff2 \|	blob \| history
ext/soap/soap.c	diff1 \|	diff2 \|	blob \| history
ext/standard/dns.c	diff1 \|	diff2 \|	blob \| history
ext/standard/string.c	diff1 \|	diff2 \|	blob \| history

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