summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-11-26 08:33:32 +0100
committerAnatol Belski <ab@php.net>2014-11-26 08:33:32 +0100
commit1414f2c095bb87c3ce1dcd24366b960e9a759b78 (patch)
tree1999c03de8fa07f1e9296bed2f74e2b9adb85d26
parent4576b4d58a8fcc1fce5b69e948ab782696e78aaa (diff)
parent68126a76b459c89a04449791849f6564ff13f696 (diff)
downloadphp-git-1414f2c095bb87c3ce1dcd24366b960e9a759b78.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: updated lib versions
-rw-r--r--win32/build/libs_version.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index 0ea0067a62..b6e1eb6447 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -3,7 +3,7 @@ cclient-2007f
freetype-2.5.3
icu-53.1
jpeglib-9a
-libcurl-7.36.0
+libcurl-7.39.0
libiconv-1.14
libmcrypt-2.5.8
libmpir-2.6.0
@@ -13,4 +13,4 @@ libssh2-1.4.3
libtidy-20090406
libxslt-1.1.27
libxml-2.9.1
-openssl-1.0.1h
+openssl-1.0.1i