]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 18 Jun 2015 20:05:07 +0000 (22:05 +0200)
committerAnatol Belski <ab@php.net>
Thu, 18 Jun 2015 20:05:07 +0000 (22:05 +0200)
commitcdde1be056b21ae6bee51a9c22711c22cede568b
tree6a0d7d765aac89ed4d9bf8f4ffd859b2a89f3352
parent076a64524f701f18caaa5d14b3512bc1ff48c462
parent962fe01473ac3fa9346dc51fd2b74d9a22ec1ed4
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  updated NEWS
  fixes bug #69835: phpinfo() does not report many Windows SKUs
ext/standard/info.c
ext/standard/winver.h