From: Anatol Belski <ab@php.net>
Date: Wed, 26 Nov 2014 07:33:32 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1414f2c095bb87c3ce1dcd24366b960e9a759b78;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated lib versions
---

1414f2c095bb87c3ce1dcd24366b960e9a759b78
diff --cc win32/build/libs_version.txt
index 0ea0067a62,7d42d790e4..b6e1eb6447
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@@ -1,9 -1,9 +1,9 @@@
  bz2-1.0.6
  cclient-2007f
 -freetype-2.4.10
 -icu-51.2
 +freetype-2.5.3
 +icu-53.1
  jpeglib-9a
- libcurl-7.36.0
+ libcurl-7.39.0
  libiconv-1.14
  libmcrypt-2.5.8
  libmpir-2.6.0