com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/standard/info.c win32/build/confutils.js
| From: | Anatol Belski | Date: | Sun, 31 May 2015 17:32:21 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/standard/info.c win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87019@lists.php.net to get a copy of this message | ||
Commit: 021effbe977083bfce7387aed8e006f2eeb8e50a
Author: Anatol Belski <ab@php.net> Sun, 31 May 2015 19:32:21 +0200
Parents: 60c925fd41d954a23ca9b9387f02add2e77b37ec 1e9522021ab147d7986fbd93dcd3eafae2b24620
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=021effbe977083bfce7387aed8e006f2eeb8e50a
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backport the basic code to properly recognize win 8.1 and 10
backport the manifest changes for makefile
backport the manifest changes in js
add default manifest
add test
Changed paths:
MM ext/standard/info.c
MM win32/build/confutils.js
Diff: