]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2597f5d 074b86d)
Merge branch 'PHP-5.6' into PHP-7.0
authorPierrick Charron <pierrick@php.net>
Wed, 27 Jul 2016 04:38:54 +0000 (00:38 -0400)
committerPierrick Charron <pierrick@php.net>
Wed, 27 Jul 2016 04:38:54 +0000 (00:38 -0400)
Conflicts:
main/streams/streams.c

1  2 
main/streams/streams.c patch | diff1 | diff2 | blob | history

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