]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Sat, 3 Oct 2015 08:46:10 +0000 (10:46 +0200)
committerAnatol Belski <ab@php.net>
Sat, 3 Oct 2015 08:46:10 +0000 (10:46 +0200)
* PHP-5.6:
  fix win10 support

1  2 
ext/opcache/shared_alloc_win32.c

Simple merge