From: Leigh Date: Mon, 12 Dec 2016 12:23:50 +0000 (+0000) Subject: Merge branch 'master' into remove-mcrypt X-Git-Tag: php-7.2.0alpha1~827^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff8fbf41c1e3ad96b7065c380e9a054092c94842;p=php Merge branch 'master' into remove-mcrypt --- ff8fbf41c1e3ad96b7065c380e9a054092c94842 diff --cc win32/build/libs_version.txt index ed9d68f83e,716fad3c8b..9d3f9be796 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@@ -3,8 -3,9 +3,8 @@@ cclient-2007 freetype-2.6.2 icu-57.1 jpeglib-9b - libcurl-7.50.3 + libcurl-7.51.0 libiconv-1.14 -libmcrypt-2.5.8 libmpir-2.7.2 libpng-1.6.21 libpq-9.5.3