From: Anatol Belski <ab@php.net>
Date: Thu, 13 Mar 2014 09:31:03 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~479^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0634b5be5010198998020fccbeaa36c2098ef13;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libs_version.txt

Conflicts:
	win32/build/libs_version.txt
---

f0634b5be5010198998020fccbeaa36c2098ef13
diff --cc win32/build/libs_version.txt
index 2ab585063b,b4fbfbc0e6..8fdf065853
--- 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