diff options
| author | Anatol Belski <ab@php.net> | 2014-03-27 18:19:24 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-03-27 18:19:24 +0100 |
| commit | 972c451c73029ba877d77a151771e4961ae5eaee (patch) | |
| tree | becfaf509871f23ee306f17bf0fa3f58e0a52637 | |
| parent | 84cd0f9911b7070f342aadc6b04e312152e2e3ca (diff) | |
| parent | 1283722589a8cccd6c49aa9d9c78edeec43f094e (diff) | |
| download | php-git-972c451c73029ba877d77a151771e4961ae5eaee.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update lib versions
Conflicts:
win32/build/libs_version.txt
| -rw-r--r-- | win32/build/libs_version.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt index b4fbfbc0e6..bc15d5b1cc 100644 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@ -3,7 +3,7 @@ cclient-2007f freetype-2.4.10 icu-51.2 jpeglib-9a -libcurl-7.35.0 +libcurl-7.36.0 libiconv-1.14 libmcrypt-2.5.8 libmpir-2.6.0 |