com php-src: Merge branch 'PHP-5.5' into PHP-5.6: win32/bui ld/libs_version.txt
| From: | Anatol Belski | Date: | Wed, 26 Nov 2014 07:33:32 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: win32/bui ld/libs_version.txt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83334@lists.php.net to get a copy of this message | ||
Commit: 1414f2c095bb87c3ce1dcd24366b960e9a759b78
Author: Anatol Belski <ab@php.net> Wed, 26 Nov 2014 08:33:32 +0100
Parents: 4576b4d58a8fcc1fce5b69e948ab782696e78aaa 68126a76b459c89a04449791849f6564ff13f696
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1414f2c095bb87c3ce1dcd24366b960e9a759b78
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated lib versions
Changed paths:
MM win32/build/libs_version.txt
Diff:
diff --cc win32/build/libs_version.txt
index 0ea0067,7d42d79..b6e1eb6
--- 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-53.1
jpeglib-9a
- libcurl-7.36.0
+ libcurl-7.39.0
libiconv-1.14
libmcrypt-2.5.8
libmpir-2.6.0