]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2649af 021effb)
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sun, 31 May 2015 17:33:34 +0000 (19:33 +0200)
committerAnatol Belski <ab@php.net>
Sun, 31 May 2015 17:33:34 +0000 (19:33 +0200)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.