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

1  2 
ext/standard/info.c patch | diff1 | diff2 | blob | history
win32/build/confutils.js patch | diff1 | diff2 | blob | history

diff --cc ext/standard/info.c
Simple merge
diff --cc win32/build/confutils.js
Simple merge
Unnamed repository; edit this file 'description' to name the repository.