com php-src: Merge branch 'PHP-5.5' into PHP-5.6: win32/bui ld/libs_version.txt

Commit: 7a2dbc0e7cd315878e117fd1d42627f94396ccf8 Author: Anatol Belski <ab@php.net> Mon, 12 Jan 2015 12:58:37 +0100 Parents: 5065505c935913e124d647df6f80f5efddae39a9 2923f24042877994028ef0e420d8efe768eab7a8 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7a2dbc0e7cd315878e117fd1d42627f94396ccf8 Log: 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 Bugs: https://bugs.php.net/68784 Changed paths: MM win32/build/libs_version.txt Diff: diff --cc win32/build/libs_version.txt index 091c3f3,1079e7f..983117e --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@@ -1,9 -1,9 +1,9 @@@ bz2-1.0.6 cclient-2007f -freetype-2.4.10 -icu-51.2 +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