]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Sun, 18 Dec 2016 23:53:17 +0000 (00:53 +0100)
committerAnatol Belski <ab@php.net>
Sun, 18 Dec 2016 23:53:17 +0000 (00:53 +0100)
* PHP-7.1:
  fix proto

1  2 
ext/standard/dns.c
ext/standard/dns_win32.c

Simple merge
Simple merge