com php-src: Merge branch 'PHP-5.5' into PHP-5.6: win32/bui ld/libs_version.txt
| From: | Anatol Belski | Date: | Thu, 27 Mar 2014 17:19:43 +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-76610@lists.php.net to get a copy of this message | ||
Commit: 5f54cecde99e55ed58206f6100df84c2cac264be
Author: Anatol Belski <ab@php.net> Thu, 27 Mar 2014 18:19:43 +0100
Parents: a84e5dc37dc0ff8c313164d9db141d3d9f2b2730 972c451c73029ba877d77a151771e4961ae5eaee
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5f54cecde99e55ed58206f6100df84c2cac264be
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update lib versions
Changed paths:
MM win32/build/libs_version.txt
Diff:
diff --cc win32/build/libs_version.txt
index 8fdf065,bc15d5b..13e98a2
--- 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-52.1
jpeglib-9a
- libcurl-7.35.0
+ libcurl-7.36.0
libiconv-1.14
libmcrypt-2.5.8
libmpir-2.6.0