]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bccd48 06bbb65)
Merge branch 'PHP-5.5' into PHP-5.6
authorNikita Popov <nikic@php.net>
Wed, 12 Mar 2014 13:16:58 +0000 (14:16 +0100)
committerNikita Popov <nikic@php.net>
Wed, 12 Mar 2014 13:16:58 +0000 (14:16 +0100)
1  2 
ext/hash/hash.c patch | diff1 | diff2 | blob | history

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