Commit: 1e1db9d9bb8dffc9421d8d8ac0eeafcf33389d26 Author: Anatoliy Belsky <a...@php.net> Tue, 18 Sep 2012 10:20:05 +0200 Parents: bb276c615509a1c6abc8f621bac7f35ce75ddd13 6752f38ccca37213865f330a2f0dc49d834dc92e Branches: PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1e1db9d9bb8dffc9421d8d8ac0eeafcf33389d26 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: updated libary versions Conflicts: win32/build/libs_version.txt Changed paths: MM win32/build/libs_version.txt Diff: diff --cc win32/build/libs_version.txt index 0d1af3d,2640fd5..3df3be3 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@@ -4,13 -4,14 +4,13 @@@ freetype-2.4. icu-4.6.1 jpeglib-6b libcurl-7.24.0 - libiconv-1.11 + libiconv-1.14 libmcrypt-2.5.8 -libmpir-1.3.1 +libmpir-2.5.1 libpng-1.2.46 libpq-8.3.6 libssh2-1.3.0 libtidy-20090325 - libxslt-1.1.23 - libxml-2.7.7 - openssl-0.9.8u + libxslt-1.1.27 + libxml-2.7.8 + openssl-0.9.8x - -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
