From: Anatol Belski <ab@php.net>
Date: Mon, 18 Sep 2017 07:37:46 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC3~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de2f28ede1ad63a93ae342d76f99c3066c6374b9;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update lib_versions.txt
---

de2f28ede1ad63a93ae342d76f99c3066c6374b9
diff --cc win32/build/libs_version.txt
index 8b45700a14,16f46cdb07..6d1a797d56
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@@ -8,9 -8,9 +8,9 @@@ libiconv-1.1
  libmpir-3.0.0
  libpng-1.6.29
  libpq-9.6.2
 +libsodium-1.0.12
  libssh2-1.8.0
  libtidy-5.4.0
- libxslt-1.1.29
- libxml-2.9.4
+ libxslt-1.1.30
+ libxml-2.9.5
 -openssl-1.0.2k
 +openssl-1.1.0e