]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35b463a 87cabc0)
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 19 Nov 2013 11:42:44 +0000 (12:42 +0100)
committerRemi Collet <remi@php.net>
Tue, 19 Nov 2013 11:42:44 +0000 (12:42 +0100)
* PHP-5.5:
  avoid doing a stream_select on a closed stream

1  2 
run-tests.php patch | diff1 | diff2 | blob | history

diff --cc run-tests.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.