From: Anatol Belski <ab@php.net>
Date: Mon, 12 Jan 2015 11:58:37 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.6RC1~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a2dbc0e7cd315878e117fd1d42627f94396ccf8;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated libs_versions.txt
  Fix bug #68784
  We can't output absolute S and T values for the Diophantine solution here since it can vary based on the libgmp version we are linking against and in general there are almost always multiple valid solutions
---

7a2dbc0e7cd315878e117fd1d42627f94396ccf8
diff --cc win32/build/libs_version.txt
index 091c3f3282,1079e7feab..983117e56e
--- 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-54.1
  jpeglib-9a
- libcurl-7.39.0
+ libcurl-7.40.0
  libiconv-1.14
  libmcrypt-2.5.8
  libmpir-2.6.0