granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ebaba26 2b8024b)

author	Anatol Belski <ab@php.net>
	Sun, 25 Sep 2016 18:58:09 +0000 (20:58 +0200)
committer	Anatol Belski <ab@php.net>
	Sun, 25 Sep 2016 18:58:09 +0000 (20:58 +0200)
commit	56ff6139741975aee021cd0e7fb0b3895ffe117a
tree	69f73921d7f7c768e7723f4cca516c9c89fb769e	tree \| snapshot
parent	ebaba26d392bcca36c0ae61282d7ef57576c821b	commit \| diff
parent	2b8024bb049cb9f32da5b107196dcc6c7dd7de35	commit \| diff

Merge branch 'PHP-7.1'

* PHP-7.1:
Add an include path for freetype which is relevant for cmake builds

ext/gd/config.w32

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