From: Anatol Belski Date: Thu, 12 Feb 2015 19:29:51 +0000 (+0100) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~173^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fe115ae8612bcdb5c77fc5903d3174e5dbb92ca;p=php Merge branch 'PHP-5.6' * PHP-5.6: backport gd config.w32 to support freetype 2.5 --- 3fe115ae8612bcdb5c77fc5903d3174e5dbb92ca