From: Anatol Belski Date: Sun, 25 Sep 2016 18:57:30 +0000 (+0200) Subject: Merge branch 'PHP-7.0' into PHP-7.1 X-Git-Tag: php-7.1.0RC3~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b8024bb049cb9f32da5b107196dcc6c7dd7de35;p=php Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Add an include path for freetype which is relevant for cmake builds --- 2b8024bb049cb9f32da5b107196dcc6c7dd7de35