]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26c944a e1e5caf)
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Tue, 3 Jan 2017 01:13:04 +0000 (02:13 +0100)
committerNikita Popov <nikic@php.net>
Tue, 3 Jan 2017 01:13:04 +0000 (02:13 +0100)
1  2 
ext/standard/browscap.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/browscap.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.