granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c90f7f6 d690014)

author	Andrea Faulds <ajf@ajf.me>
	Sun, 11 Sep 2016 21:46:20 +0000 (22:46 +0100)
committer	Andrea Faulds <ajf@ajf.me>
	Sun, 11 Sep 2016 21:46:20 +0000 (22:46 +0100)
commit	fc5497cb923df43e20deff3e03d1bfa50acc0570
tree	825752e4f4a4f73a7bf3da0346f6c8ebf326eef2	tree \| snapshot
parent	c90f7f66eadb8bc5577c39b9b4d6a4fe2d60f78e	commit \| diff
parent	d690014bf35507ccb7a1150a27504d2f87848842	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

18 files changed:

Zend/zend_API.c	diff1 \|	diff2 \|	blob \| history
Zend/zend_API.h	diff1 \|	diff2 \|	blob \| history
Zend/zend_builtin_functions.c	diff1 \|	diff2 \|	blob \| history
Zend/zend_generators.c	diff1 \|	diff2 \|	blob \| history
ext/pcre/php_pcre.c	diff1 \|	diff2 \|	blob \| history
ext/reflection/php_reflection.c	diff1 \|	diff2 \|	blob \| history
ext/spl/spl_array.c	diff1 \|	diff2 \|	blob \| history
ext/standard/array.c	diff1 \|	diff2 \|	blob \| history
ext/standard/basic_functions.c	diff1 \|	diff2 \|	blob \| history
ext/standard/file.c	diff1 \|	diff2 \|	blob \| history
ext/standard/filestat.c	diff1 \|	diff2 \|	blob \| history
ext/standard/formatted_print.c	diff1 \|	diff2 \|	blob \| history
ext/standard/html.c	diff1 \|	diff2 \|	blob \| history
ext/standard/math.c	diff1 \|	diff2 \|	blob \| history
ext/standard/streamsfuncs.c	diff1 \|	diff2 \|	blob \| history
ext/standard/string.c	diff1 \|	diff2 \|	blob \| history
ext/standard/type.c	diff1 \|	diff2 \|	blob \| history
ext/standard/url.c	diff1 \|	diff2 \|	blob \| history

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