]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f47408 4e0134c)
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Sat, 13 Feb 2016 16:48:17 +0000 (17:48 +0100)
committerNikita Popov <nikic@php.net>
Sat, 13 Feb 2016 16:48:17 +0000 (17:48 +0100)
1  2 
ext/standard/string.c patch | diff1 | diff2 | blob | history

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