granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f353162 304fb7a)

author	Reeze Xia <reeze@php.net>
	Tue, 3 Mar 2015 08:27:35 +0000 (16:27 +0800)
committer	Reeze Xia <reeze@php.net>
	Tue, 3 Mar 2015 08:27:35 +0000 (16:27 +0800)
commit	6cb3b941df1a0390a1e1c2de1c001fc6df8e955e
tree	b012036215639cea1d96c1f3a4b219b65f4b8d07	tree \| snapshot
parent	f353162ca2f33baf79cd77d7aa05693b03b121d8	commit \| diff
parent	304fb7a3d6adbf08fee7e27f4da4e2bd0ef09c48	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Improve fix for bug 67741
  Added type checks
  Added type checks

ext/soap/php_encoding.c	diff1 \|	diff2 \|	blob \| history
ext/soap/php_http.c	diff1 \|	diff2 \|	blob \| history
ext/soap/soap.c	diff1 \|	diff2 \|	blob \| history
main/main.c	diff1 \|	diff2 \|	blob \| history

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