]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Sat, 15 Apr 2017 15:30:43 +0000 (17:30 +0200)
committerAnatol Belski <ab@php.net>
Sat, 15 Apr 2017 15:30:43 +0000 (17:30 +0200)
* PHP-7.1:
  extend error map

1  2 
win32/winutil.c

diff --cc win32/winutil.c
Simple merge