]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61af3ed 14c72cc)
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Mon, 9 Jan 2017 22:29:33 +0000 (23:29 +0100)
committerNikita Popov <nikic@php.net>
Mon, 9 Jan 2017 22:29:33 +0000 (23:29 +0100)
1  2 
ext/standard/config.m4 patch | diff1 | diff2 | blob | history

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