projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4707ed 60e181c)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 09:25:21 +0000 (11:25 +0200)
committerAnatol Belski <ab@php.net>
Wed, 10 Jun 2015 09:25:21 +0000 (11:25 +0200)
* PHP-5.5:
  updated NEWS
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"
  Revert "Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business""
  Fix #69781: phpinfo() reports Professional Editions of Windows 7/8/8.1/10 as "Business"

1  2 
ext/standard/info.c patch | diff1 | diff2 | blob | history

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