com php-src: Merge branch 'PHP-5.6' into PHP-7.0: main/streams/streams.c
| From: | Pierrick Charron | Date: | Wed, 27 Jul 2016 04:38:54 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: main/streams/streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93410@lists.php.net to get a copy of this message | ||
Commit: 6714f73545a8a186931f6fa91c23c4b700ba8ef7
Author: Pierrick Charron <pierrick@php.net> Wed, 27 Jul 2016 00:38:54 -0400
Parents: 2597f5d66552051994ed55655107d9c5142f7d34 074b86d8451365c81d3ae76616fb4df1757ddc1f
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6714f73545a8a186931f6fa91c23c4b700ba8ef7
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
main/streams/streams.c
Changed paths:
MM main/streams/streams.c
Diff: