diff options
| author | Anatol Belski <ab@php.net> | 2014-03-13 10:31:03 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-03-13 10:31:03 +0100 |
| commit | f0634b5be5010198998020fccbeaa36c2098ef13 (patch) | |
| tree | f07b1d6affa2cfa51d97d87b0e2494e044778d7f | |
| parent | 973f379efcb43887a83317482c7916004d1a2506 (diff) | |
| parent | f7b9c12ed91461c18c6de6f5c75e998625f8de76 (diff) | |
| download | php-git-f0634b5be5010198998020fccbeaa36c2098ef13.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated libs_version.txt
Conflicts:
win32/build/libs_version.txt
| -rw-r--r-- | win32/build/libs_version.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt index 2ab585063b..8fdf065853 100644 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@ -1,13 +1,13 @@ bz2-1.0.6 cclient-2007f -freetype-2.4.10 +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.3.2 libssh2-1.4.3 libtidy-20090406 |