granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fae17a0 ac45696)

author	Sara Golemon <pollita@php.net>
	Tue, 19 Aug 2014 20:22:14 +0000 (13:22 -0700)
committer	Sara Golemon <pollita@php.net>
	Tue, 19 Aug 2014 20:22:14 +0000 (13:22 -0700)
commit	a309dda7771503b5972b5faec2f3234ed0637781
tree	6dba86bc5c7a340f28844571808025950c1d7c27	tree \| snapshot
parent	fae17a00f556b7c1a2221289c46403bfb4367034	commit \| diff
parent	ac4569621dc8762862dca6d39adf4ceb39e7e00b	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Switch use of strtok() to gd_strtok_r()

NEWS	diff1 \|	diff2 \|	blob \| history
ext/gd/libgd/gdft.c	diff1 \|	diff2 \|	blob \| history

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