diff options
| author | Anatol Belski <ab@php.net> | 2015-01-12 12:58:37 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-01-12 12:58:37 +0100 |
| commit | 7a2dbc0e7cd315878e117fd1d42627f94396ccf8 (patch) | |
| tree | d07721e11ae7901fedd28eccee16cdc9bb73c570 | |
| parent | 5065505c935913e124d647df6f80f5efddae39a9 (diff) | |
| parent | 2923f24042877994028ef0e420d8efe768eab7a8 (diff) | |
| download | php-git-7a2dbc0e7cd315878e117fd1d42627f94396ccf8.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libs_versions.txt
Fix bug #68784
We can't output absolute S and T values for the Diophantine solution here since it can vary based on the libgmp version we are linking against and in general there are almost always multiple valid solutions
| -rw-r--r-- | win32/build/libs_version.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt index 091c3f3282..983117e56e 100644 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@ -3,7 +3,7 @@ cclient-2007f freetype-2.5.3 icu-54.1 jpeglib-9a -libcurl-7.39.0 +libcurl-7.40.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.1i +openssl-1.0.1k |