granicus.if.org Git - php/commit

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

author	Julien Pauli <jpauli@php.net>
	Mon, 4 Jan 2016 17:13:38 +0000 (18:13 +0100)
committer	Julien Pauli <jpauli@php.net>
	Mon, 4 Jan 2016 17:13:38 +0000 (18:13 +0100)
commit	736b91c6507b196e9ddd84aba3f98ee7ed66c63d
tree	91e52c4f21d6557500f52d1358203324050bf942	tree \| snapshot
parent	0ea63cb2a8512dbd1f6d7d8b171a626f5c10b2c6	commit \| diff
parent	53fb2f1e5c6037a5182c2e0dcd5bac7ecdb7c150	commit \| diff

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Happy new year (Update copyright to 2016)

Conflicts:
ext/json/php_json_encoder.h
sapi/continuity/capi.c

build/build2.mk	diff1 \|	diff2 \|	blob \| history
build/buildcheck.sh	diff1 \|	diff2 \|	blob \| history
ext/mysqli/mysqli_mysqlnd.h	diff1 \|	diff2 \|	blob \| history
ext/standard/dns_win32.c	diff1 \|	diff2 \|	blob \| history
main/build-defs.h.in	diff1 \|	diff2 \|	blob \| history
main/internal_functions.c.in	diff1 \|	diff2 \|	blob \| history
run-tests.php	diff1 \|	diff2 \|	blob \| history
server-tests.php	diff1 \|	diff2 \|	blob \| history
win32/build/Makefile	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

build/build2.mk	diff1 \|	diff2 \|	blob \| history
build/buildcheck.sh	diff1 \|	diff2 \|	blob \| history
ext/mysqli/mysqli_mysqlnd.h	diff1 \|	diff2 \|	blob \| history
ext/standard/dns_win32.c	diff1 \|	diff2 \|	blob \| history
main/build-defs.h.in	diff1 \|	diff2 \|	blob \| history
main/internal_functions.c.in	diff1 \|	diff2 \|	blob \| history
run-tests.php	diff1 \|	diff2 \|	blob \| history
server-tests.php	diff1 \|	diff2 \|	blob \| history
win32/build/Makefile	diff1 \|	diff2 \|	blob \| history