com php-src: Merge branch 'PHP-5.4' into PHP-5.5: win32/bui ld/libs_version.txt
| From: | Anatol Belski | Date: | Thu, 27 Mar 2014 17:19:24 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: win32/bui ld/libs_version.txt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76609@lists.php.net to get a copy of this message | ||
Commit: 972c451c73029ba877d77a151771e4961ae5eaee
Author: Anatol Belski <ab@php.net> Thu, 27 Mar 2014 18:19:24 +0100
Parents: 84cd0f9911b7070f342aadc6b04e312152e2e3ca 1283722589a8cccd6c49aa9d9c78edeec43f094e
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=972c451c73029ba877d77a151771e4961ae5eaee
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update lib versions
Conflicts:
win32/build/libs_version.txt
Changed paths:
MM win32/build/libs_version.txt
Diff:
diff --cc win32/build/libs_version.txt
index b4fbfbc,ec85794..bc15d5b
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@@ -1,16 -1,16 +1,16 @@@
bz2-1.0.6
-cclient-2007e
+cclient-2007f
freetype-2..4.10
-icu-49.1.2
-jpeglib-8
+icu-51.2
+jpeglib-9a
- libcurl-7.35.0
+ libcurl-7.36.0
libiconv-1.14
libmcrypt-2.5.8
-libmpir-2.5.1
-libpng-1.2.50
-libpq-8.3.6
-libssh2-1.4.2
-libtidy-20090325
+libmpir-2.6.0
+libpng-1.5.18
+libpq-9.2.2
+libssh2-1.4.3
+libtidy-20090406
libxslt-1.1.27
-libxml-2.7.8
-openssl-0.9.8y
+libxml-2.9.1
+openssl-1.0.1f