diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-09-18 10:20:05 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-09-18 10:20:05 +0200 |
| commit | 1e1db9d9bb8dffc9421d8d8ac0eeafcf33389d26 (patch) | |
| tree | a844cb34ec199d5d999f6c613e3e7346cad1a493 /win32 | |
| parent | bb276c615509a1c6abc8f621bac7f35ce75ddd13 (diff) | |
| parent | 6752f38ccca37213865f330a2f0dc49d834dc92e (diff) | |
| download | php-git-1e1db9d9bb8dffc9421d8d8ac0eeafcf33389d26.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
updated libary versions
Conflicts:
win32/build/libs_version.txt
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/libs_version.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt index 0d1af3d1b4..3df3be3795 100644 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@ -4,13 +4,13 @@ freetype-2.4.3 icu-4.6.1
jpeglib-6b
libcurl-7.24.0
-libiconv-1.11
+libiconv-1.14
libmcrypt-2.5.8
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
|