com php-src: Merge branch 'master' into remove-mcrypt: php.ini-development php.ini-production win32/build/libs_version.txt
| From: | Leigh | Date: | Mon, 12 Dec 2016 12:23:50 +0000 |
| Subject: | com php-src: Merge branch 'master' into remove-mcrypt: php.ini-development php.ini-production win32/build/libs_version.txt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96306@lists.php.net to get a copy of this message | ||
Commit: ff8fbf41c1e3ad96b7065c380e9a054092c94842
Author: Leigh <leigh@php.net> Mon, 12 Dec 2016 12:23:50 +0000
Parents: 56908edfbe1507bbeda6949ac512847a02a5353f 505d0b0966592b3e03a7301a6ddc4ee406dbb767
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ff8fbf41c1e3ad96b7065c380e9a054092c94842
Log:
Merge branch 'master' into remove-mcrypt
Changed paths:
MM php.ini-development
MM php.ini-production
MM win32/build/libs_version.txt
Diff:
diff --cc win32/build/libs_version.txt
index ed9d68f,716fad3..9d3f9be
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@@ -3,8 -3,9 +3,8 @@@ cclient-2007
freetype-2.6.2
icu-57.1
jpeglib-9b
- libcurl-7.50.3
+ libcurl-7.51.0
libiconv-1.14
-libmcrypt-2.5.8
libmpir-2.7.2
libpng-1.6.21
libpq-9.5.3