com php-src: Merge branch 'PHP-5.5' into PHP-5.6: win32/bui ld/libs_version.txt
| From: | Anatol Belski | Date: | Thu, 13 Mar 2014 09:31:03 +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-76480@lists.php.net to get a copy of this message | ||
Commit: f0634b5be5010198998020fccbeaa36c2098ef13
Author: Anatol Belski <ab@php.net> Thu, 13 Mar 2014 10:31:03 +0100
Parents: 973f379efcb43887a83317482c7916004d1a2506 f7b9c12ed91461c18c6de6f5c75e998625f8de76
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f0634b5be5010198998020fccbeaa36c2098ef13
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libs_version.txt
Conflicts:
win32/build/libs_version.txt
Changed paths:
MM win32/build/libs_version.txt
Diff:
diff --cc win32/build/libs_version.txt
index 2ab5850,b4fbfbc..8fdf065
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@@ -1,14 -1,14 +1,14 @@@
bz2-1.0.6
cclient-2007f
--freetype-2.4.10
-icu-51.2
++freetype-2.5.3
+icu-52.1
- jpeglib-9
+ jpeglib-9a
libcurl-7.35..0
libiconv-1.14
libmcrypt-2.5.8
libmpir-2.6.0
- libpng-1.5.14
+ libpng-1.5.18
-libpq-9.2.2
+libpq-9.3.2
libssh2-1.4.3
libtidy-20090406
libxslt-1.1.27