granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: edf601a a0955f3)

author	Adam Harvey <aharvey@php.net>
	Sun, 8 Dec 2013 03:41:23 +0000 (19:41 -0800)
committer	Adam Harvey <aharvey@php.net>
	Sun, 8 Dec 2013 03:41:23 +0000 (19:41 -0800)
commit	d7a45a67be2b82272a908cff54cc4d78a3c6e206
tree	56bc7b99ba3e6e331b95e93d182fe5d26cc98cad	tree \| snapshot
parent	edf601a41f4d8b468883c25f3981d20fd2a9921d	commit \| diff
parent	a0955f351c7eb1022da7ae36970ffef3b00c8aff	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Switch to using freetype-config for freetype detection.

NEWS	diff1 \|	diff2 \|	blob \| history
ext/gd/config.m4	diff1 \|	diff2 \|	blob \| history

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