]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ac1529 08fce8e)
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Thu, 3 Mar 2016 16:14:18 +0000 (17:14 +0100)
committerNikita Popov <nikic@php.net>
Thu, 3 Mar 2016 16:14:18 +0000 (17:14 +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.