From: Anatol Belski <ab@php.net>
Date: Sun, 31 May 2015 17:33:34 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha1~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbadc05d32eb5f71a6b225a3b441e0b03474806f;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  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
---

cbadc05d32eb5f71a6b225a3b441e0b03474806f