]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.6:
  update NEWS
  updated NEWS
  fixes bug #69835: phpinfo() does not report many Windows SKUs

1  2 
ext/standard/info.c
ext/standard/winver.h

Simple merge
Simple merge